History

Merge pull request #38 from thypon/dockstar

Juan RP committed 11 years ago

Commit 96e5d152 parents e514350 8a42aec1 file · +4 −2Browse files

Unified · Split

mkrootfs.sh.in+4−2
@@ -46,7 +46,7 @@ usage() { · 45 unmodified lines
46Usage: $PROGNAME [options] <platform>46Usage: $PROGNAME [options] <platform>
47 47
48Supported platforms: i686, i686-musl, x86_64, x86_64-musl,48Supported platforms: i686, i686-musl, x86_64, x86_64-musl,
49 bananapi, beaglebone, cubieboard2, cubietruck,49 dockstar, bananapi, beaglebone, cubieboard2, cubietruck,
50 odroid-u2, rpi, rpi2 (armv7), usbarmory50 odroid-u2, rpi, rpi2 (armv7), usbarmory
51 51
52Options52Options
@@ -91,7 +91,7 @@ register_binfmt() { · 38 unmodified lines
91 fi91 fi
92 mountpoint -q /proc/sys/fs/binfmt_misc || modprobe -q binfmt_misc; mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc92 mountpoint -q /proc/sys/fs/binfmt_misc || modprobe -q binfmt_misc; mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
93 case "${_ARCH}" in93 case "${_ARCH}" in
94 armv?l*)94 armv*)
95 echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:' > /proc/sys/fs/binfmt_misc/register95 echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:' > /proc/sys/fs/binfmt_misc/register
96 cp -f $(which qemu-arm-static) $rootfs/usr/bin || die "failed to copy qemu-arm-static to the rootfs"96 cp -f $(which qemu-arm-static) $rootfs/usr/bin || die "failed to copy qemu-arm-static to the rootfs"
97 ;;97 ;;
@@ -125,6 +125,7 @@ case "$PLATFORM" in · 27 unmodified lines
125 i686) _TARGET_ARCH="$PLATFORM"; _ARCH="i386";;125 i686) _TARGET_ARCH="$PLATFORM"; _ARCH="i386";;
126 x86_64-musl) _TARGET_ARCH="$PLATFORM"; _ARCH="x86_64";;126 x86_64-musl) _TARGET_ARCH="$PLATFORM"; _ARCH="x86_64";;
127 x86_64) _TARGET_ARCH="$PLATFORM"; _ARCH="x86_64";;127 x86_64) _TARGET_ARCH="$PLATFORM"; _ARCH="x86_64";;
128 dockstar) _TARGET_ARCH="armv5tel"; _ARCH="armv5tel";;
128 rpi-musl) _TARGET_ARCH="armv6l-musl"; _ARCH="armv6l";;129 rpi-musl) _TARGET_ARCH="armv6l-musl"; _ARCH="armv6l";;
129 rpi) _TARGET_ARCH="armv6l"; _ARCH="armv6l";;130 rpi) _TARGET_ARCH="armv6l"; _ARCH="armv6l";;
130 *-musl) _TARGET_ARCH="armv7l-musl"; _ARCH="armv7l";;131 *-musl) _TARGET_ARCH="armv7l-musl"; _ARCH="armv7l";;
@@ -145,6 +146,7 @@ case "$PLATFORM" in · 14 unmodified lines
145 bananapi*) SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;;146 bananapi*) SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;;
146 beaglebone*) SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;;147 beaglebone*) SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;;
147 cubieboard2*|cubietruck*) SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;;148 cubieboard2*|cubietruck*) SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;;
149 dockstar*) SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;;
148 odroid-u2*) SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;;150 odroid-u2*) SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;;
149 rpi2*) SUBPLATFORM=rpi; QEMU_BIN=qemu-arm-static;;151 rpi2*) SUBPLATFORM=rpi; QEMU_BIN=qemu-arm-static;;
150 rpi*) SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;;152 rpi*) SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t