diff --git a/Makefile b/Makefile index 6600661fcf2da5c48777cb72e277028e5168d66a..5d70082f40736adc8770972fdd6cd741d52d036d 100644 --- a/Makefile +++ b/Makefile @@ -393,6 +393,19 @@ repo_package_info : $(REPO_DIST_DIR)/binary-$(call altarch,$(ARCH))/Packages.bz2 $(REPO_DIST_DIR)/binary-$(call altarch,$(PRIMARY_ARCH))/Packages.bz2 $(REPO_DIST_DIR)/binary-$(call altarch,$(SECONDARY_ARCH))/Packages.bz2 : $(REPO_DIST_DIR)/binary-%/Packages.bz2 : $(REPO_ARCHIVE_DIR)/Packages.% mkdir -p "$(REPO_ARCHIVE_DIR)" mkdir -p "$(REPO_DIST_DIR)/binary-$*/" + #info/release file + echo "Archive: $(ISO_RELEASE)" > "$(REPO_DIST_DIR)/binary-$*/Release" + echo "Version: $(shell echo $(ISO_VERSION) | cut -f-2 -d'.')" \ + >> "$(REPO_DIST_DIR)/binary-$*/Release" + echo "Component: main" \ + >> "$(REPO_DIST_DIR)/binary-$*/Release" + echo "Origin: Ubuntu" \ + >> "$(REPO_DIST_DIR)/binary-$*/Release" + echo "Label: Ubuntu" \ + >> "$(REPO_DIST_DIR)/binary-$*/Release" + echo "Architecture: $*" \ + >> "$(REPO_DIST_DIR)/binary-$*/Release" + cd "$(REPO_ARCHIVE_DIR)" \ && cat Packages.noarch "Packages.$*" | bzip2 -c9 > "$(REPO_DIST_DIR)/binary-$*/Packages.bz2" @@ -401,9 +414,24 @@ $(REPO_DIST_DIR)/binary-$(call altarch,$(PRIMARY_ARCH))/Packages.bz2 $(REPO_DIST repo_metadata : $(REPO_ARCHIVE_DIR)/Release $(REPO_ARCHIVE_DIR)/Release : $(REPO_DIST_DIR)/binary-$(call altarch,$(PRIMARY_ARCH))/Packages.bz2 $(REPO_DIST_DIR)/binary-$(call altarch,$(SECONDARY_ARCH))/Packages.bz2 mkdir -p "$(REPO_ARCHIVE_DIR)" - $(CURDIR)/scripts/mkdebarchive-metadata.sh "$(ISO_RELEASE)" \ - "$$(echo $(ISO_VERSION) | cut -f-2 -d'.')" \ - "$(REPO_ARCHIVE_DIR)" "$(PRIMARY_ARCH)" "$(SECONDARY_ARCH)" + + echo "Origin: Ubuntu" > "$(REPO_ARCHIVE_DIR)"/Release + echo "Label: LIP Ubuntu Extra Packages" \ + >> "$(REPO_ARCHIVE_DIR)"/Release + echo "Suite: $(ISO_RELEASE)" \ + >> "$(REPO_ARCHIVE_DIR)"/Release + echo "Version: $(shell echo $(ISO_VERSION) | cut -f-2 -d'.')" \ + >> "$(REPO_ARCHIVE_DIR)"/Release + echo "Codename: $(ISO_RELEASE)" \ + >> "$(REPO_ARCHIVE_DIR)"/Release + echo "Date: $$(LC_ALL=C date -u)" \ + >> "$(REPO_ARCHIVE_DIR)"/Release + echo "Architectures: $(PRIMARY_ARCH) $(SECONDARY_ARCH)" \ + >> "$(REPO_ARCHIVE_DIR)"/Release + echo "Components: lip" \ + >> "$(REPO_ARCHIVE_DIR)"/Release + echo "Description: Ubuntu $(ISO_RELEASE) $(shell echo $(ISO_VERSION) | cut -f-2 -d'.')" \ + >> "$(REPO_ARCHIVE_DIR)"/Release repo_clean: $(RM) -r "$(REPO_DIST_DIR)" diff --git a/scripts/mkdebarchive-metadata.sh b/scripts/mkdebarchive-metadata.sh deleted file mode 100755 index cec2eb1b30c779cb7f2b66abaf7bf89370910aa9..0000000000000000000000000000000000000000 --- a/scripts/mkdebarchive-metadata.sh +++ /dev/null @@ -1,72 +0,0 @@ -#! /bin/bash -set -e - -#Note: this script is a subset of mkdebarchive.sh. It generates only the metadata and assumes -#that the package files as well as the correct dirctory structure exist. -#The original script may be found in ../legacy_scripts . - -echo "mkdebarchive.sh (C) 2012-2014 Mmoebius/ALUG, trilader/ALUG; 2014 Christopher Spinrath/OSAK" -echo "License: GPLv3 GNU Public License" -echo "Usage: mkdebarchive-metadata.sh dist-codename dist-version archives-dir architecture_list..." - -test $# -ge 4 || ( echo "Expecting at least 4 arguments!" && exit 1 ) - -DIST_CODENAME="$1" -DIST_VERSION="$2" -BUILD_DATE="$(LC_ALL=C date -u)" -echo "Running for Ubuntu $DIST_VERSION ($DIST_CODENAME)..." - -ARCHIVES_DIR="$3" - -#we have three arguments followed by the architecture list -shift 3 - -echo "Prerequisite: Alle .deb-Packete liegen in $ARCHIVES_DIR" -test -d "$ARCHIVES_DIR" || { echo "FAIL: no '$ARCHIVES_DIR'"; exit 2; } -cd "$ARCHIVES_DIR" - -ARCH_STR="" - -for ARCH in $@; do - -echo -echo "Erzeuge './dists/$DIST_CODENAME/lip/binary-$ARCH/Release'" -mkdir -p "dists/$DIST_CODENAME/lip/binary-$ARCH/" -cat >dists/$DIST_CODENAME/lip/binary-$ARCH/Release <<EOF -Archive: $DIST_CODENAME -Version: $DIST_VERSION -Component: main -Origin: Ubuntu -Label: Ubuntu -Architecture: $ARCH -EOF - -ARCH_STR="$ARCH_STR $ARCH" - -done - -echo -echo "Erzeuge './Release'" -cat >Release <<EOF -Origin: Ubuntu -Label: LIP Ubuntu Extra Packages -Suite: $DIST_CODENAME -Version: $DIST_VERSION -Codename: $DIST_CODENAME -Date: $BUILD_DATE -Architectures: $ARCH_STR -Components: lip -Description: Ubuntu $DIST_CODENAME $DIST_VERSION -EOF - -#echo -#echo "Erzeuge einen geeigneten Eintrag für APT in 'sources.list.d/01lip-stick-extra.list'" -#echo "deb [ trusted=yes ] file:/${PWD#/} $DIST_CODENAME lip" > /etc/apt/sources.list.d/01lip-stick-extra.list - -#echo -#echo "User: Bitte gleich 'apt-get update' starten. Das sollte das Repository einbinden" -#echo "In diesem Verzeichnis liegen noch 3 Packages.* -Dateien. Die können gelöscht werden" -#echo "Ende." - -#end; -