From 83b06f4f07ae26ef02fd909f18288f43ed4c3c29 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 29 Aug 2011 04:52:58 +0200
Subject: it must be cpuarch, otherwise qemu-mips is not distinguished from
 qemu-mipsel

---
 scripts/update-sys | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/update-sys b/scripts/update-sys
index 268184428..bcfbfa84e 100755
--- a/scripts/update-sys
+++ b/scripts/update-sys
@@ -50,7 +50,7 @@ config $archsym
 EOF
 
 if [ "${system}" = "toolchain" -o "${system}" = "qemu" ];then
-	sys=${system}-$arch
+	sys=${system}-$cpuarch
 else
 	sys=$system
 fi
-- 
cgit v1.2.3


From 52577cbeee1714c28e3bbd887e0d90d3590c858c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 2 Sep 2011 19:48:59 +0200
Subject: fix image creation

---
 scripts/create-image.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/create-image.sh b/scripts/create-image.sh
index f3e03eced..2b5b34bc9 100755
--- a/scripts/create-image.sh
+++ b/scripts/create-image.sh
@@ -79,11 +79,13 @@ printf "Creating filesystem $filesystem\n"
 
 printf "Create partition and filesystem\n"
 $parted -s $1 mklabel msdos
-$parted -s $1 mkpart primary ext2 0 98%
+$parted -s $1 -- mkpart primary ext2 0 -0
 $parted -s $1 set 1 boot on
 
-dd if=$1 of=mbr bs=16384 count=1 2>/dev/null
-dd if=$1 skip=16384 of=$1.new 2>/dev/null
+offset=$(parted $1 unit b print | tail -2 | head -1 | cut -f 1 --delimit="B" | cut -c 9-)
+
+dd if=$1 of=mbr bs=$offset count=1 2>/dev/null
+dd if=$1 skip=$offset of=$1.new 2>/dev/null
 
 if [ "$filesystem" = "ext2" -o "$filesystem" = "ext3" -o "$filesystem" = "ext4" ];then
 	mkfsopts=-F
@@ -105,7 +107,7 @@ rm mbr
 
 tmp=$(mktemp -d)
 
-mount -o loop,offset=16384 -t $filesystem $1 $tmp
+mount -o loop,offset=$offset -t $filesystem $1 $tmp
 
 if [ -z $initramfs ];then
 	printf "Extracting install archive\n"
-- 
cgit v1.2.3


From f139a9abc43cce01741da6193ba6aa8e60411430 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 11 Sep 2011 06:21:45 +0200
Subject: always add /dev/{console,tty,null} to initramfs

---
 mk/image.mk      |   3 ++-
 scripts/dev.cpio | Bin 0 -> 1024 bytes
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 scripts/dev.cpio

(limited to 'scripts')

diff --git a/mk/image.mk b/mk/image.mk
index 78b18e716..e6dd06a82 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -103,9 +103,10 @@ ${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR}
 	echo "CONFIG_BLK_DEV_INITRD=y" >> ${LINUX_DIR}/.config
 	echo 'CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"' >> \
 		${LINUX_DIR}/.config
+	cp $(TOPDIR)/scripts/dev.cpio $@
 	cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \
 		sed "s#\(.*\)#:0:0::::::\1#" | sort | \
-	    ${TOOLS_DIR}/cpio -o -C512 -Hnewc -P >$@ 2>/dev/null
+	    ${TOOLS_DIR}/cpio -o -C512 -Hnewc -A -P -O $@ 2>/dev/null
 
 ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
 	${STAGING_HOST_DIR}/bin/mksquashfs ${TARGET_DIR} \
diff --git a/scripts/dev.cpio b/scripts/dev.cpio
new file mode 100644
index 000000000..de17c7097
Binary files /dev/null and b/scripts/dev.cpio differ
-- 
cgit v1.2.3