From 7d2b3bdbbf81c55e173e7b93c9a29f115c811f05 Mon Sep 17 00:00:00 2001 From: hennr Date: Thu, 16 Jun 2011 04:54:38 -0700 Subject: [PATCH 1/4] Fix for issue #8 in the issue tracker. The script ignore if the first md5sum failed, both are now checked and the script will exit properly if one of the check does not succeed. --- config/release/create_installstick | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) mode change 100755 => 100644 config/release/create_installstick diff --git a/config/release/create_installstick b/config/release/create_installstick old mode 100755 new mode 100644 index f82a792952..73634bec48 --- a/config/release/create_installstick +++ b/config/release/create_installstick @@ -56,14 +56,9 @@ echo "# Please read the instructions and use very carefully.. #" echo "# #" echo "#########################################################" -# check MD5 sums - echo "checking MD5 sum..." - md5sum -c target/KERNEL.md5 - MD5_ERROR="$?" - md5sum -c target/SYSTEM.md5 - MD5_ERROR="$?" - -if [ "$MD5_ERROR" = "1" ]; then +md5sumFailed() +{ + clear echo "#########################################################" echo "# #" echo "# OpenELEC.tv failed md5 check - Installation will quit #" @@ -73,7 +68,19 @@ if [ "$MD5_ERROR" = "1" ]; then echo "# #" echo "#########################################################" exit 1 -fi +} + + +# check MD5 sums + echo "checking MD5 sum..." + md5sum -c target/KERNEL.md5 + if [ "$?" = "1" ]; then + md5sumFailed + fi + md5sum -c target/SYSTEM.md5 + if [ "$?" = "1" ]; then + md5sumFailed + fi # (TODO) umount anything umount "$PART" From 1266653b80e518051ef44f86c18396f59176fdf6 Mon Sep 17 00:00:00 2001 From: hennr Date: Thu, 16 Jun 2011 05:36:59 -0700 Subject: [PATCH 2/4] Some typos. Added a second "sync" command because umount is not patient and will cancel the unmounting process if there is too much left to write to the stick. --- config/release/create_installstick | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) mode change 100755 => 100644 config/release/create_installstick diff --git a/config/release/create_installstick b/config/release/create_installstick old mode 100755 new mode 100644 index f82a792952..a87f9d2fd9 --- a/config/release/create_installstick +++ b/config/release/create_installstick @@ -136,6 +136,10 @@ fi cp README /tmp/usb_install cp RELEASE /tmp/usb_install +# syncing disk + echo "syncing disk..." + sync + # unmount partition echo "unmounting partition $PART..." umount "$PART" @@ -143,11 +147,11 @@ fi # write mbr echo "writing mbr..." if [ -f /usr/lib/syslinux/mbr.bin ]; then - MBR="/usr/lib/syslinux/mbr.bin" # example: ubuntu + MBR="/usr/lib/syslinux/mbr.bin" # example: debian, ubuntu elif [ -f /usr/share/syslinux/mbr.bin ]; then MBR="/usr/share/syslinux/mbr.bin" # example: fedora else - echo "Dont find mbr.bin on Host OS" + echo "Can't find mbr.bin on Host OS" fi if [ -n "$MBR" ]; then @@ -162,4 +166,4 @@ fi echo "cleaning tempdir..." rmdir /tmp/usb_install -echo "...ready" +echo "...finished installation" From 74c14056076f8f0fb1415db6eb30b254edca286c Mon Sep 17 00:00:00 2001 From: hennr Date: Thu, 16 Jun 2011 05:43:36 -0700 Subject: [PATCH 3/4] Adds three checks for tools needed by the installer --- config/release/create_installstick | 52 ++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) mode change 100755 => 100644 config/release/create_installstick diff --git a/config/release/create_installstick b/config/release/create_installstick old mode 100755 new mode 100644 index f82a792952..fb8ddb3691 --- a/config/release/create_installstick +++ b/config/release/create_installstick @@ -56,6 +56,58 @@ echo "# Please read the instructions and use very carefully.. #" echo "# #" echo "#########################################################" +# check for some required tools + + # this is needed to create a bootloader + which syslinux > /dev/null + if [ "$?" = "1" ]; then + clear + echo "#########################################################" + echo "# #" + echo "# OpenELEC.tv missing tool - Installation will quit #" + echo "# #" + echo "# We can't find the required tool \"syslinux\" #" + echo "# on your system. #" + echo "# Please install it via your package manager. #" + echo "# #" + echo "#########################################################" + exit 1 + fi + + # this is needed by syslinux + which mcopy > /dev/null + if [ "$?" = "1" ]; then + clear + echo "#########################################################" + echo "# #" + echo "# OpenELEC.tv missing tool - Installation will quit #" + echo "# #" + echo "# We can't find the required tool \"mcopy\" #" + echo "# on your system. #" + echo "# Please install it via your package manager. #" + echo "# NOTE: Some distributions call this package #" + echo "# \"mtools\". #" + echo "# #" + echo "#########################################################" + exit 1 + fi + + # this is needed to partion the stick + which parted > /dev/null + if [ "$?" = "1" ]; then + clear + echo "#########################################################" + echo "# #" + echo "# OpenELEC.tv missing tool - Installation will quit #" + echo "# #" + echo "# We can't find the required tool \"parted\" #" + echo "# on your system. #" + echo "# Please install it via your package manager. #" + echo "# #" + echo "#########################################################" + exit 1 + fi + # check MD5 sums echo "checking MD5 sum..." md5sum -c target/KERNEL.md5 From ccbf221c87e6b824167ea13764ca3b354d70b9e9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 17 Jun 2011 07:04:03 +0200 Subject: [PATCH 4/4] projects/*/linux: enable CONFIG_PREEMPT_VOLUNTARY Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 4 ++-- projects/Fusion/linux/linux.i386.conf | 4 ++-- projects/Generic/linux/linux.i386.conf | 4 ++-- projects/ION/linux/linux.i386.conf | 4 ++-- projects/ION/linux/linux.x86_64.conf | 4 ++-- projects/Intel/linux/linux.i386.conf | 4 ++-- projects/Intel/linux/linux.x86_64.conf | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 115bc522c6..f3679dc57b 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -329,8 +329,8 @@ CONFIG_NR_CPUS=2 # CONFIG_SCHED_SMT is not set # CONFIG_SCHED_MC is not set CONFIG_IRQ_TIME_ACCOUNTING=y -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 15ffb52772..e6c93f127f 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -322,8 +322,8 @@ CONFIG_NR_CPUS=4 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y # CONFIG_IRQ_TIME_ACCOUNTING is not set -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index d9875c3300..a76ae93ad2 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -324,8 +324,8 @@ CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y # CONFIG_IRQ_TIME_ACCOUNTING is not set -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 0aa90cef31..b97571f360 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -322,8 +322,8 @@ CONFIG_NR_CPUS=4 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y # CONFIG_IRQ_TIME_ACCOUNTING is not set -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index b86b527057..d1b3db2bc2 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -295,8 +295,8 @@ CONFIG_NR_CPUS=4 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y # CONFIG_IRQ_TIME_ACCOUNTING is not set -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 22ddfdcbc0..a55a215e0d 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -323,8 +323,8 @@ CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y # CONFIG_IRQ_TIME_ACCOUNTING is not set -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 6b09445d3c..960b520715 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -297,8 +297,8 @@ CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y # CONFIG_IRQ_TIME_ACCOUNTING is not set -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y