mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mkrootfs: generate x86 tarballs correctly, requested by scaleway.

Browse Source
This commit is contained in:
Juan RP
2016-04-20 14:36:57 +02:00
parent 4c932c619e
commit a15f8c0300
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mkrootfs.sh.in
View File

@@ -76,7 +76,11 @@ umount_pseudofs() {
run_cmd_target() { run_cmd_target() {
info_msg "Running $@ for target $_ARCH ..." info_msg "Running $@ for target $_ARCH ..."
if [ "${_TARGET_ARCH}" != "${_ARCH}" ]; then
eval XBPS_TARGET_ARCH=${_TARGET_ARCH:=${_ARCH}} "$@" eval XBPS_TARGET_ARCH=${_TARGET_ARCH:=${_ARCH}} "$@"
else
eval XBPS_ARCH=${_ARCH} "$@"
fi
[ $? -ne 0 ] && die "Failed to run $@" [ $? -ne 0 ] && die "Failed to run $@"
} }
@@ -123,9 +127,9 @@ PLATFORM="$1"
SUBPLATFORM=$PLATFORM SUBPLATFORM=$PLATFORM
case "$PLATFORM" in case "$PLATFORM" in
i686-musl) _TARGET_ARCH="$PLATFORM"; _ARCH="i386";; i686-musl) _TARGET_ARCH="$PLATFORM"; _ARCH="i686-musl";;
i686) _TARGET_ARCH="$PLATFORM"; _ARCH="i386";; i686) _TARGET_ARCH="$PLATFORM"; _ARCH="i686";;
x86_64-musl) _TARGET_ARCH="$PLATFORM"; _ARCH="x86_64";; x86_64-musl) _TARGET_ARCH="$PLATFORM"; _ARCH="x86_64-musl";;
x86_64) _TARGET_ARCH="$PLATFORM"; _ARCH="x86_64";; x86_64) _TARGET_ARCH="$PLATFORM"; _ARCH="x86_64";;
dockstar) _TARGET_ARCH="armv5tel"; _ARCH="armv5tel";; dockstar) _TARGET_ARCH="armv5tel"; _ARCH="armv5tel";;
rpi-musl) _TARGET_ARCH="armv6l-musl"; _ARCH="armv6l";; rpi-musl) _TARGET_ARCH="armv6l-musl"; _ARCH="armv6l";;
@@ -136,7 +140,10 @@ esac
: ${XBPS_REPOSITORY:=--repository=http://repo.voidlinux.eu/current --repository=http://muslrepo.voidlinux.eu/current} : ${XBPS_REPOSITORY:=--repository=http://repo.voidlinux.eu/current --repository=http://muslrepo.voidlinux.eu/current}
: ${XBPS_CACHEDIR:=--cachedir=$PWD/xbps-cachedir-${_TARGET_ARCH}} : ${XBPS_CACHEDIR:=--cachedir=$PWD/xbps-cachedir-${_TARGET_ARCH}}
: ${PKGBASE:=base-system} case "$PLATFORM" in
i686*|x86_64*) PKGBASE="base-voidstrap";;
*) PKGBASE="base-system";;
esac
if [ -z "$PLATFORM" ]; then if [ -z "$PLATFORM" ]; then
echo "$PROGNAME: platform was not set!" echo "$PROGNAME: platform was not set!"
@@ -186,7 +193,7 @@ run_cmd_target "xbps-query -R -r $rootfs $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REP
chmod 755 $rootfs chmod 755 $rootfs
case "$PLATFORM" in case "$PLATFORM" in
i686*|x86_64*) PKGS="${PKGBASE} grub" ;; i686*|x86_64*) PKGS="${PKGBASE}" ;;
*) PKGS="${PKGBASE} ${SUBPLATFORM}-base" ;; *) PKGS="${PKGBASE} ${SUBPLATFORM}-base" ;;
esac esac
[ -n "$EXTRA_PKGS" ] && PKGS="${PKGS} ${EXTRA_PKGS}" [ -n "$EXTRA_PKGS" ] && PKGS="${PKGS} ${EXTRA_PKGS}"