diff --git a/cfg/alix/release b/cfg/alix/release index f1ea307..aa1b5e5 100755 --- a/cfg/alix/release +++ b/cfg/alix/release @@ -1,6 +1,7 @@ build_release() { local RELEASE_DIR="$1" - local ROOTFS_SQFS="$2" + + local ROOTFS_SQFS=$(find $PKGDEPLOYDIR/rootfs-${CFG}/ -name '*.img') local fname=$(find $PKGDEPLOYDIR/linux/ -name 'vmlinuz*') local linux_image=$(basename $fname) diff --git a/cfg/rpi3/release b/cfg/rpi3/release index b209334..e993ded 100755 --- a/cfg/rpi3/release +++ b/cfg/rpi3/release @@ -1,6 +1,7 @@ build_release() { local RELEASE_DIR="$1" - local ROOTFS_SQFS="$2" + + local ROOTFS_SQFS=$(find $PKGDEPLOYDIR/rootfs-${CFG}/ -name '*.img') local rootfs_image=$(basename $ROOTFS_SQFS) local bootdir="$RELEASE_DIR/boot" diff --git a/mk.sh b/mk.sh index 3fe371e..12e8fd1 100755 --- a/mk.sh +++ b/mk.sh @@ -23,8 +23,6 @@ PKGLOGDIR="$BUILDROOT/$CFG/log" PKGDOWNLOADDIR="$BUILDROOT/download" PACKAGELIST="$BUILDROOT/$CFG/pkglist" -SQFS="$BUILDROOT/$CFG/rootfs.img" - mkdir -p "$PKGDOWNLOADDIR" "$PKGSRCDIR" "$PKGBUILDDIR" "$PKGLOGDIR" mkdir -p "$PKGDEPLOYDIR" "$TCDIR/bin" @@ -109,7 +107,7 @@ mkdir -p "$RELEASEDIR" unset -f build_release source "$SCRIPTDIR/cfg/$CFG/release" -build_release "$RELEASEDIR" "$SQFS" +build_release "$RELEASEDIR" if [ -e "${BUILDROOT}/${CFG}/release-${CFG}.tar.gz" ]; then rm "${BUILDROOT}/${CFG}/release-${CFG}.tar.gz" diff --git a/pkg/rootfs-alix/build b/pkg/rootfs-alix/build index 466161d..c401da8 100755 --- a/pkg/rootfs-alix/build +++ b/pkg/rootfs-alix/build @@ -33,7 +33,5 @@ deploy() { local BUILD="$2" local DEPLOY="$3" - rm -f "$SQFS" - - mksquashfs "$BUILD" "$SQFS" -all-root -no-progress -no-xattrs + mksquashfs "$BUILD" "$DEPLOY/rootfs.img" -all-root -no-progress -no-xattrs } diff --git a/pkg/rootfs-rpi3/build b/pkg/rootfs-rpi3/build index f236308..b712b2f 100755 --- a/pkg/rootfs-rpi3/build +++ b/pkg/rootfs-rpi3/build @@ -34,7 +34,5 @@ deploy() { local BUILD="$2" local DEPLOY="$3" - rm -f "$SQFS" - - mksquashfs "$BUILD" "$SQFS" -all-root -no-progress -no-xattrs + mksquashfs "$BUILD" "$DEPLOY/rootfs.img" -all-root -no-progress -no-xattrs }