diff options
| author | Franz Dietrich | 2011-05-24 12:43:59 +0200 |
|---|---|---|
| committer | Franz Dietrich | 2011-05-24 12:43:59 +0200 |
| commit | 6a549515edadc78ff3352bf37ac48c104b5a75d5 (patch) | |
| tree | c2a8f21121e760b920d5def07fb218970b4eaf67 | |
| parent | Fix a whitespace (diff) | |
| parent | env fixes .. (diff) | |
| download | usb-boot-stick-6a549515edadc78ff3352bf37ac48c104b5a75d5.tar.gz usb-boot-stick-6a549515edadc78ff3352bf37ac48c104b5a75d5.tar.xz usb-boot-stick-6a549515edadc78ff3352bf37ac48c104b5a75d5.zip | |
Merge branch 'master' of git://git.openslx.org/openslx-ng/usb-boot-stick
| -rwxr-xr-x | bin/build.initramfs.sh | 3 | ||||
| -rw-r--r-- | config/setup.conf | 2 | ||||
| -rw-r--r-- | inc/functions.env.sh | 19 |
3 files changed, 15 insertions, 9 deletions
diff --git a/bin/build.initramfs.sh b/bin/build.initramfs.sh index e55d186..5c09790 100755 --- a/bin/build.initramfs.sh +++ b/bin/build.initramfs.sh @@ -2,6 +2,9 @@ ROOT_DIR=$(readlink -f $(dirname $(readlink -f $0))/..) +SYSLINUX=${ROOT_DIR}/contrib/syslinux/latest +[ ! -f ${SYSLINUX}/Makefile ] && $ROOT_DIR/bin/env.setup-syslinux.sh + cd ${ROOT_DIR}/build/rootfs echo -e "[build-initramfs] \t Create initramfs." find . | cpio --quiet -H newc -o > ../initramfs-default.cpio diff --git a/config/setup.conf b/config/setup.conf index e2adf31..5234371 100644 --- a/config/setup.conf +++ b/config/setup.conf @@ -1,4 +1,4 @@ -kernel_version=2.6.38.3 +kernel_version=2.6.39 kernel_url=http://www.kernel.org/pub/linux/kernel/v2.6/linux-${kernel_version}.tar.bz2 syslinux_use_testing=0 syslinux_stable_version=syslinux-4.04 diff --git a/inc/functions.env.sh b/inc/functions.env.sh index 56cc49c..ab36fb7 100644 --- a/inc/functions.env.sh +++ b/inc/functions.env.sh @@ -101,14 +101,17 @@ read_params() { run () { - set_quiet + #set_quiet + + if [ "x$CLEAN" = "x1" ]; then + [ "x$TARGET_INIT" = "x1" ] && rm -rf $ROOT_DIR/contrib/syslinux/sys* + [ "x$TARGET_KERNEL" = "x1" ] && rm -rf $ROOT_DIR/build/linux-* + fi - pre_start_cleanup - setup_dir_structure - copy_files - create_iso + [ "x$TARGET_KERNEL" = "x1" ] && $ROOT_DIR/bin/build.kernel.sh + [ "x$TARGET_INIT" = "x1" ] && $ROOT_DIR/bin/build.initramfs.sh - unset_quiet + #unset_quiet - pinfo "FINISHED: ISO can be found here: $ROOT_DIR/openslx.iso!" -}
\ No newline at end of file + pinfo "FINISHED" +} |