Merge branch 'master' into experimental

cleanup-cruft
Sebastian Pipping 14 years ago
commit 5601043568

@ -5,6 +5,15 @@
# Distributed under the GPL v2 # Distributed under the GPL v2
# $Id$ # $Id$
29 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
Bump version to 3.4.12.3
29 Jan 2011; Sebastian Pipping <sping@gentoo.org> gen_compile.sh:
No longer require device mapper bincache for compiling lvm (bug #353026)
Special thanks:
- Peter Hjalmarsson
27 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel: 27 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
Bump version to 3.4.12.2 Bump version to 3.4.12.2
@ -36,7 +45,7 @@
- Craig Andrews (Testing) - Craig Andrews (Testing)
- Laurent Pinchart (mdmon/IMSM support) - Laurent Pinchart (mdmon/IMSM support)
- Matthias Dahl (Initial patch) - Matthias Dahl (Initial patch)
- Xake (Testing) - Peter Hjalmarsson (Testing)
20 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel: 20 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
Bump version to 3.4.11.1 Bump version to 3.4.11.1
@ -46,7 +55,7 @@
.config (whereas "make clean" does not) (bug #351906) .config (whereas "make clean" does not) (bug #351906)
Special thanks: Special thanks:
- Xake - Peter Hjalmarsson
20 Jan 2011; Sebastian Pipping <sping@gentoo.org> 20 Jan 2011; Sebastian Pipping <sping@gentoo.org>
patches/busybox/1.18.1/1.18.1-mdstart.diff: patches/busybox/1.18.1/1.18.1-mdstart.diff:

@ -417,8 +417,10 @@ compile_busybox() {
} }
compile_lvm() { compile_lvm() {
if [ ! -f "${LVM_BINCACHE}" ] if [ -f "${LVM_BINCACHE}" ]
then then
print_info 1 "lvm: >> Using cache"
else
[ -f "${LVM_SRCTAR}" ] || [ -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!" 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}" cd "${TEMP}"
@ -427,10 +429,6 @@ compile_lvm() {
gen_die 'Could not extract LVM source tarball!' gen_die 'Could not extract LVM source tarball!'
[ -d "${LVM_DIR}" ] || [ -d "${LVM_DIR}" ] ||
gen_die 'LVM directory ${LVM_DIR} is invalid!' 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}" cd "${LVM_DIR}"
apply_patches lvm ${LVM_VER} apply_patches lvm ${LVM_VER}
print_info 1 'lvm: >> Configuring...' print_info 1 'lvm: >> Configuring...'

@ -2,7 +2,7 @@
# $Id$ # $Id$
PATH="${PATH}:/sbin:/usr/sbin" 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 # Set the default for TMPDIR. May be modified by genkernel.conf or the
# --tempdir command line option. # --tempdir command line option.

Loading…
Cancel
Save