diff options
| author | Christian Neukirchen <chneukirchen@gmail.com> | 2016-04-20 18:19:36 +0200 |
|---|---|---|
| committer | Christian Neukirchen <chneukirchen@gmail.com> | 2016-04-20 18:19:36 +0200 |
| commit | e8511075e68921056b1cefdf4ef29a76a830423d (patch) | |
| tree | 32ef1d9b61b1310af8825c457b0f4ba7c4fcb134 /build-rootfs.sh.in | |
| parent | 6485e862c182beb830c7fdcac967fda817e19345 (diff) | |
| parent | 06f8beb62844d34e2c310d80f9f0721e34e0934f (diff) | |
| download | hrmpf-e8511075e68921056b1cefdf4ef29a76a830423d.tar.gz hrmpf-e8511075e68921056b1cefdf4ef29a76a830423d.tar.xz hrmpf-e8511075e68921056b1cefdf4ef29a76a830423d.zip | |
Merge branch 'master' of https://github.com/voidlinux/void-mklive
* 'master' of https://github.com/voidlinux/void-mklive: *rootfs: fix remaining x86 rootfs issues. mkrootfs: generate x86 tarballs correctly, requested by scaleway. installer.sh.in: improve primary user setup build-x86-images: added dejavu-fonts-ttf as suggested by chris2. build-x86-images: switch to firefox-esr. build-x86-images: also pass -r arg to mklive. mkimage.sh.in: fix truncate size argument mklive: fix print_step()... installer.sh.in: add user account dialog installer.sh.in: avoid scrolling for wep/wpa input mklive: add -I directory inclusion option installer: check network configured on source mkrootfs: Added -k to run post hook
Diffstat (limited to 'build-rootfs.sh.in')
| -rw-r--r-- | build-rootfs.sh.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/build-rootfs.sh.in b/build-rootfs.sh.in index 526ae96..ae6985e 100644 --- a/build-rootfs.sh.in +++ b/build-rootfs.sh.in @@ -3,10 +3,10 @@ TARGET="$1" [ -n "$TARGET" ] && shift -: ${PLATFORMS:="beaglebone cubieboard2 odroid-u2 rpi rpi2 usbarmory"} +: ${PLATFORMS:="beaglebone cubieboard2 odroid-u2 rpi rpi2 usbarmory x86_64 i686"} DATE=$(date '+%Y%m%d') -for f in ${PLATFORMS} x ${PLATFORMS} ; do +for f in ${PLATFORMS} x ${PLATFORMS}; do if [ "$f" = "x" ]; then musl=1 continue @@ -15,7 +15,11 @@ for f in ${PLATFORMS} x ${PLATFORMS} ; do if [ -n "$musl" ]; then target=${f}-musl fi - if [ -z "$ARGET" -o "$TARGET" = "$target" ]; then + if [ "$target" = "i686-musl" ]; then + # XXX no i686-musl repo yet + continue + fi + if [ -z "$TARGET" -o "$TARGET" = "$target" ]; then ./mkrootfs.sh $@ $target fi done |