From db307cd351c754657ede779a1c84d9cc0b59c325 Mon Sep 17 00:00:00 2001 From: Peter Hjalmarsson Date: Fri, 28 Jan 2011 18:54:40 +0100 Subject: [PATCH 1/5] Remove unpacking of device-mapper for lvm2 Newer versions of lvm2 does include device-mapper --- gen_compile.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gen_compile.sh b/gen_compile.sh index 49caf91..cc72925 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -427,10 +427,6 @@ compile_lvm() { gen_die 'Could not extract LVM source tarball!' [ -d "${LVM_DIR}" ] || gen_die 'LVM directory ${LVM_DIR} is invalid!' - rm -rf "${TEMP}/device-mapper" > /dev/null - /bin/tar -jxpf "${DEVICE_MAPPER_BINCACHE}" -C "${TEMP}" || - gen_die "Could not extract device-mapper binary cache!"; - cd "${LVM_DIR}" apply_patches lvm ${LVM_VER} print_info 1 'lvm: >> Configuring...' From 3d94af67c988ad8615e855c4a27a915df122a142 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 29 Jan 2011 15:39:24 +0100 Subject: [PATCH 2/5] lvm: Indicate using bincache --- gen_compile.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gen_compile.sh b/gen_compile.sh index cc72925..b60b921 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -417,8 +417,10 @@ compile_busybox() { } compile_lvm() { - if [ ! -f "${LVM_BINCACHE}" ] + if [ -f "${LVM_BINCACHE}" ] then + print_info 1 "lvm: >> Using cache" + else [ -f "${LVM_SRCTAR}" ] || gen_die "Could not find LVM source tarball: ${LVM_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!" cd "${TEMP}" From aa102ae6a1184bd65151db903e3ecf40d33a7fd2 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 29 Jan 2011 15:42:02 +0100 Subject: [PATCH 3/5] docs: Resolve nick Xake to Peter Hjalmarsson --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index db31f4f..1aa87ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,7 +36,7 @@ - Craig Andrews (Testing) - Laurent Pinchart (mdmon/IMSM support) - Matthias Dahl (Initial patch) - - Xake (Testing) + - Peter Hjalmarsson (Testing) 20 Jan 2011; Sebastian Pipping genkernel: Bump version to 3.4.11.1 @@ -46,7 +46,7 @@ .config (whereas "make clean" does not) (bug #351906) Special thanks: - - Xake + - Peter Hjalmarsson 20 Jan 2011; Sebastian Pipping patches/busybox/1.18.1/1.18.1-mdstart.diff: From 88d15b280b59df10d0e56576b31828947484ad43 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 29 Jan 2011 15:44:44 +0100 Subject: [PATCH 4/5] Extend change log --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1aa87ac..5e0a670 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,12 @@ # Distributed under the GPL v2 # $Id$ + 29 Jan 2011; Sebastian Pipping gen_compile.sh: + No longer require device mapper bincache for compiling lvm (bug #353026) + + Special thanks: + - Peter Hjalmarsson + 27 Jan 2011; Sebastian Pipping genkernel: Bump version to 3.4.12.2 From 8b3848e030b2eff0569823cb0f3d4e467248ab3b Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 29 Jan 2011 15:45:17 +0100 Subject: [PATCH 5/5] Bump version to 3.4.12.3 --- ChangeLog | 3 +++ genkernel | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5e0a670..e9c797f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ # Distributed under the GPL v2 # $Id$ + 29 Jan 2011; Sebastian Pipping genkernel: + Bump version to 3.4.12.3 + 29 Jan 2011; Sebastian Pipping gen_compile.sh: No longer require device mapper bincache for compiling lvm (bug #353026) diff --git a/genkernel b/genkernel index a450bc3..afe8fc4 100755 --- a/genkernel +++ b/genkernel @@ -2,7 +2,7 @@ # $Id$ PATH="${PATH}:/sbin:/usr/sbin" -GK_V='3.4.12.2' +GK_V='3.4.12.3' # Set the default for TMPDIR. May be modified by genkernel.conf or the # --tempdir command line option.