diff --git a/mk.sh b/mk.sh index b1ea2b2..d7dc0fa 100755 --- a/mk.sh +++ b/mk.sh @@ -30,6 +30,7 @@ PACKAGELIST="$BUILDROOT/pkglist" REPODIR="$BUILDROOT/repo" DEPENDSLIST="$BUILDROOT/depends" PROVIDESLIST="$BUILDROOT/provides" +PREFERESLIST="$BUILDROOT/preferes" declare -A PREFERED_PROVIDER @@ -71,7 +72,7 @@ done echo "--- resolving package dependencies ---" -truncate -s 0 $DEPENDSLIST $PROVIDESLIST +truncate -s 0 "$DEPENDSLIST" "$PROVIDESLIST" "$PREFERESLIST" for pkg in $SCRIPTDIR/pkg/*; do include_pkg $(basename $pkg) @@ -84,8 +85,12 @@ for pkg in $SCRIPTDIR/pkg/*; do done done -pkg buildstrategy -p "$PROVIDESLIST" -d "$DEPENDSLIST" \ - "${PREFERED_PROVIDER[release]}" > "$PACKAGELIST" +for pkg in "${!PREFERED_PROVIDER[@]}"; do + echo "$pkg,${PREFERED_PROVIDER[$pkg]}" >> "$PREFERESLIST" +done + +pkg buildstrategy -p "$PROVIDESLIST" -d "$DEPENDSLIST" -P "$PREFERESLIST" \ + "release" > "$PACKAGELIST" cat "$PACKAGELIST" echo "--- building packages ---" diff --git a/pkg/release-alix/build b/pkg/release-alix/build index 41d95e1..a4287c0 100755 --- a/pkg/release-alix/build +++ b/pkg/release-alix/build @@ -1,4 +1,5 @@ DEPENDS="rootfs" +SUBPKG="release" build() { pkg install -om -r "$PKGBUILDDIR/$OS_RELEASE" -R "$REPODIR" $DEPENDS @@ -19,10 +20,8 @@ build() { } deploy() { - tar czf "$BUILDROOT/$PKGNAME.tar.gz" * - - touch "$PKGDEPLOYDIR/$PKGNAME.files" - touch "$PKGDEPLOYDIR/$PKGNAME.desc" + tar czf "$BUILDROOT/release.tar.gz" * + touch "$PKGDEPLOYDIR/release.files" "$PKGDEPLOYDIR/release.desc" } check_update() { diff --git a/pkg/release-qemu/build b/pkg/release-qemu/build index 40bc6db..35abd1e 100755 --- a/pkg/release-qemu/build +++ b/pkg/release-qemu/build @@ -1,4 +1,5 @@ DEPENDS="rootfs" +SUBPKG="release" build() { pkg install -om -r "$PKGBUILDDIR/$OS_RELEASE" -R "$REPODIR" $DEPENDS @@ -23,10 +24,8 @@ build() { } deploy() { - tar czf "$BUILDROOT/$PKGNAME.tar.gz" * - - touch "$PKGDEPLOYDIR/$PKGNAME.files" - touch "$PKGDEPLOYDIR/$PKGNAME.desc" + tar czf "$BUILDROOT/release.tar.gz" * + touch "$PKGDEPLOYDIR/release.files" "$PKGDEPLOYDIR/release.desc" } check_update() { diff --git a/pkg/release-rpi3/build b/pkg/release-rpi3/build index e640a90..8e09206 100755 --- a/pkg/release-rpi3/build +++ b/pkg/release-rpi3/build @@ -1,4 +1,5 @@ DEPENDS="rootfs boot-rpi3" +SUBPKG="release" build() { pkg install -om -r "$PKGBUILDDIR/boot" -R "$REPODIR" $DEPENDS @@ -21,10 +22,8 @@ build() { } deploy() { - tar czf "$BUILDROOT/$PKGNAME.tar.gz" * - - touch "$PKGDEPLOYDIR/$PKGNAME.files" - touch "$PKGDEPLOYDIR/$PKGNAME.desc" + tar czf "$BUILDROOT/release.tar.gz" * + touch "$PKGDEPLOYDIR/release.files" "$PKGDEPLOYDIR/release.desc" } check_update() {