pygos/build
1
0
Fork 0
mirror of https://github.com/pygos/build.git synced 2024-11-22 11:09:46 +01:00
Code Issues Releases Wiki Activity

Remove magic squashfs path variable

Browse source 
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
This commit is contained in:
David Oberhollenzer 2018-01-16 21:10:20 +01:00
parent 4039cd1c81
commit 40fd03640c
5 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cfg/alix/release
View file

@ -1,6 +1,7 @@
build_release() { build_release() {
local RELEASE_DIR="$1" 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 fname=$(find $PKGDEPLOYDIR/linux/ -name 'vmlinuz*')
local linux_image=$(basename $fname) local linux_image=$(basename $fname)

3
cfg/rpi3/release
View file

@ -1,6 +1,7 @@
build_release() { build_release() {
local RELEASE_DIR="$1" local RELEASE_DIR="$1"
local ROOTFS_SQFS="$2"
local ROOTFS_SQFS=$(find $PKGDEPLOYDIR/rootfs-${CFG}/ -name '*.img')
local rootfs_image=$(basename $ROOTFS_SQFS) local rootfs_image=$(basename $ROOTFS_SQFS)
local bootdir="$RELEASE_DIR/boot" local bootdir="$RELEASE_DIR/boot"

4
mk.sh
View file

@ -23,8 +23,6 @@ PKGLOGDIR="$BUILDROOT/$CFG/log"
PKGDOWNLOADDIR="$BUILDROOT/download" PKGDOWNLOADDIR="$BUILDROOT/download"
PACKAGELIST="$BUILDROOT/$CFG/pkglist" PACKAGELIST="$BUILDROOT/$CFG/pkglist"
SQFS="$BUILDROOT/$CFG/rootfs.img"
mkdir -p "$PKGDOWNLOADDIR" "$PKGSRCDIR" "$PKGBUILDDIR" "$PKGLOGDIR" mkdir -p "$PKGDOWNLOADDIR" "$PKGSRCDIR" "$PKGBUILDDIR" "$PKGLOGDIR"
mkdir -p "$PKGDEPLOYDIR" "$TCDIR/bin" mkdir -p "$PKGDEPLOYDIR" "$TCDIR/bin"
@ -109,7 +107,7 @@ mkdir -p "$RELEASEDIR"
unset -f build_release unset -f build_release
source "$SCRIPTDIR/cfg/$CFG/release" source "$SCRIPTDIR/cfg/$CFG/release"
build_release "$RELEASEDIR" "$SQFS" build_release "$RELEASEDIR"
if [ -e "${BUILDROOT}/${CFG}/release-${CFG}.tar.gz" ]; then if [ -e "${BUILDROOT}/${CFG}/release-${CFG}.tar.gz" ]; then
rm "${BUILDROOT}/${CFG}/release-${CFG}.tar.gz" rm "${BUILDROOT}/${CFG}/release-${CFG}.tar.gz"

4
pkg/rootfs-alix/build
View file

@ -33,7 +33,5 @@ deploy() {
local BUILD="$2" local BUILD="$2"
local DEPLOY="$3" local DEPLOY="$3"
rm -f "$SQFS" mksquashfs "$BUILD" "$DEPLOY/rootfs.img" -all-root -no-progress -no-xattrs
mksquashfs "$BUILD" "$SQFS" -all-root -no-progress -no-xattrs
} }

4
pkg/rootfs-rpi3/build
View file

@ -34,7 +34,5 @@ deploy() {
local BUILD="$2" local BUILD="$2"
local DEPLOY="$3" local DEPLOY="$3"
rm -f "$SQFS" mksquashfs "$BUILD" "$DEPLOY/rootfs.img" -all-root -no-progress -no-xattrs
mksquashfs "$BUILD" "$SQFS" -all-root -no-progress -no-xattrs
} }