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

*rootfs: fix remaining x86 rootfs issues.

Browse Source
This commit is contained in:
Juan RP 2016-04-20 16:19:55 +02:00
parent a15f8c0300
commit 06f8beb628
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build-rootfs.sh.in
View File

@ -3,10 +3,10 @@
TARGET="$1" TARGET="$1"
[ -n "$TARGET" ] && shift [ -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') DATE=$(date '+%Y%m%d')
for f in ${PLATFORMS} x ${PLATFORMS} ; do for f in ${PLATFORMS} x ${PLATFORMS}; do
if [ "$f" = "x" ]; then if [ "$f" = "x" ]; then
musl=1 musl=1
continue continue
@ -15,7 +15,11 @@ for f in ${PLATFORMS} x ${PLATFORMS} ; do
if [ -n "$musl" ]; then if [ -n "$musl" ]; then
target=${f}-musl target=${f}-musl
fi 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 ./mkrootfs.sh $@ $target
fi fi
done done

17
mkrootfs.sh.in
View File

@ -76,11 +76,10 @@ 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 case "${_TARGET_ARCH}" in
eval XBPS_TARGET_ARCH=${_TARGET_ARCH:=${_ARCH}} "$@" i686*|x86_64*) eval XBPS_ARCH=${_TARGET_ARCH} "$@";;
else *) eval XBPS_TARGET_ARCH=${_TARGET_ARCH:=${_ARCH}} "$@";;
eval XBPS_ARCH=${_ARCH} "$@" esac
fi
[ $? -ne 0 ] && die "Failed to run $@" [ $? -ne 0 ] && die "Failed to run $@"
} }
@ -127,10 +126,8 @@ PLATFORM="$1"
SUBPLATFORM=$PLATFORM SUBPLATFORM=$PLATFORM
case "$PLATFORM" in case "$PLATFORM" in
i686-musl) _TARGET_ARCH="$PLATFORM"; _ARCH="i686-musl";; i686*) _TARGET_ARCH="$PLATFORM"; _ARCH="i686";;
i686) _TARGET_ARCH="$PLATFORM"; _ARCH="i686";; x86_64*) _TARGET_ARCH="$PLATFORM"; _ARCH="x86_64";;
x86_64-musl) _TARGET_ARCH="$PLATFORM"; _ARCH="x86_64-musl";;
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";;
rpi) _TARGET_ARCH="armv6l"; _ARCH="armv6l";; rpi) _TARGET_ARCH="armv6l"; _ARCH="armv6l";;
@ -218,7 +215,7 @@ if [ -n "${_ARCH}" ]; then
info_msg "Reconfiguring packages for ${_ARCH} ..." info_msg "Reconfiguring packages for ${_ARCH} ..."
case "$PLATFORM" in case "$PLATFORM" in
i686*|x86_64*) i686*|x86_64*)
run_cmd "XBPS_ARCH=$_ARCH xbps-reconfigure -r $rootfs base-files" run_cmd "XBPS_ARCH=${PLATFORM} xbps-reconfigure -r $rootfs base-files"
;; ;;
*) *)
register_binfmt register_binfmt