From b0abfba526d56b271d33cc77fbc397470f3fc13a Mon Sep 17 00:00:00 2001 From: Ivan Davidov Date: Sat, 7 Feb 2015 20:13:34 +0200 Subject: [PATCH] Minor structural updates. --- src/0_prepare.sh | 1 + src/1_get_kernel.sh | 5 +++-- src/2_build_kernel.sh | 3 ++- src/3_get_busybox.sh | 3 ++- src/4_build_busybox.sh | 3 ++- src/5_generate_rootfs.sh | 1 + src/6_pack_rootfs.sh | 1 + src/7_generate_iso.sh | 1 + 8 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/0_prepare.sh b/src/0_prepare.sh index 7f153ed22..b1f8e4ed3 100755 --- a/src/0_prepare.sh +++ b/src/0_prepare.sh @@ -5,3 +5,4 @@ mkdir work # -p stops errors if the directory already exists mkdir -p source + diff --git a/src/1_get_kernel.sh b/src/1_get_kernel.sh index daeef565e..0d79b79a1 100755 --- a/src/1_get_kernel.sh +++ b/src/1_get_kernel.sh @@ -16,8 +16,9 @@ wget -c $DOWNLOAD_URL rm -rf ../work/kernel mkdir ../work/kernel -# Extract kernel to folder 'kernel' -# Full path will be something like 'kernel\linux-3.16.1' +# Extract kernel to folder 'work/kernel' +# Full path will be something like 'work/kernel/linux-3.16.1' tar -xvf $ARCHIVE_FILE -C ../work/kernel cd .. + diff --git a/src/2_build_kernel.sh b/src/2_build_kernel.sh index f9602526a..0b406adab 100755 --- a/src/2_build_kernel.sh +++ b/src/2_build_kernel.sh @@ -2,7 +2,7 @@ cd work/kernel -# Change to the first directory ls finds, e.g. 'linux-3.16.1' +# Change to the first directory ls finds, e.g. 'linux-3.18.6' cd $(ls -d *) # Cleans up the kernel sources, including configuration files @@ -20,3 +20,4 @@ sed -i "s/.*CONFIG_DEFAULT_HOSTNAME.*/CONFIG_DEFAULT_HOSTNAME=\"minimal\"/" .con make bzImage cd ../../.. + diff --git a/src/3_get_busybox.sh b/src/3_get_busybox.sh index 71993e51c..672bb5841 100755 --- a/src/3_get_busybox.sh +++ b/src/3_get_busybox.sh @@ -17,7 +17,8 @@ rm -rf ../work/busybox mkdir ../work/busybox # Extract busybox to folder 'busybox' -# Full path will be something like 'busybox\busybox-1.22.1' +# Full path will be something like 'work/busybox/busybox-1.23.1' tar -xvf $ARCHIVE_FILE -C ../work/busybox cd .. + diff --git a/src/4_build_busybox.sh b/src/4_build_busybox.sh index 18da9f315..7c457dfa5 100755 --- a/src/4_build_busybox.sh +++ b/src/4_build_busybox.sh @@ -2,7 +2,7 @@ cd work/busybox -# Change to the first directory ls finds, e.g. 'busybox-1.22.1' +# Change to the first directory ls finds, e.g. 'busybox-1.23.1' cd $(ls -d *) # Remove previously generated artefacts @@ -23,3 +23,4 @@ make busybox make install cd ../../.. + diff --git a/src/5_generate_rootfs.sh b/src/5_generate_rootfs.sh index fc64f8f19..aab6dbe3b 100755 --- a/src/5_generate_rootfs.sh +++ b/src/5_generate_rootfs.sh @@ -77,3 +77,4 @@ chmod +r src/*.sh chmod +r src/.config cd ../.. + diff --git a/src/6_pack_rootfs.sh b/src/6_pack_rootfs.sh index 764d2a986..67710f0b8 100755 --- a/src/6_pack_rootfs.sh +++ b/src/6_pack_rootfs.sh @@ -9,3 +9,4 @@ cd rootfs find . | cpio -H newc -o | gzip > ../rootfs.cpio.gz cd ../.. + diff --git a/src/7_generate_iso.sh b/src/7_generate_iso.sh index 414cada52..dbebe7007 100755 --- a/src/7_generate_iso.sh +++ b/src/7_generate_iso.sh @@ -9,3 +9,4 @@ make isoimage FDINITRD=../../rootfs.cpio.gz cp arch/x86/boot/image.iso ../../../minimal_linux_live.iso cd ../../.. +