From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RwO8t-0006W2-Nl for garchives@archives.gentoo.org; Sun, 12 Feb 2012 01:22:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7690E06FE; Sun, 12 Feb 2012 01:22:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A6F79E06A1 for ; Sun, 12 Feb 2012 01:22:08 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D55A71B4008 for ; Sun, 12 Feb 2012 01:22:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9A0D3E53FF for ; Sun, 12 Feb 2012 01:22:06 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <45e8dbfa0e6b193662b2c0273f90e66452c4a102.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog gen_cmdline.sh gen_compile.sh gen_determineargs.sh gen_funcs.sh genkernel.conf X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 45e8dbfa0e6b193662b2c0273f90e66452c4a102 Date: Sun, 12 Feb 2012 01:22:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 17178ca5-71bd-4301-9d1c-9e9796b07ce8 X-Archives-Hash: c613a32afa5f8042275c31728e49b033 commit: 45e8dbfa0e6b193662b2c0273f90e66452c4a102 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Feb 12 01:16:27 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Feb 12 01:16:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D45e8dbfa device-mapper "update". It was merged into LVM2-2.02.67 upstream in 2010.= Bug #398467 is wrong for the device-mapper update. --- ChangeLog | 5 +++++ gen_cmdline.sh | 8 ++++---- gen_compile.sh | 33 +-------------------------------- gen_determineargs.sh | 2 -- gen_funcs.sh | 2 +- genkernel.conf | 5 ----- 6 files changed, 11 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index f867f22..b77d111 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ # Distributed under the GPL v2 # $Id$ =20 + 12 Feb 2012; Robin H. Johnson gen_cmdline.sh, + gen_compile.sh, gen_determineargs.sh, gen_funcs.sh, genkernel.conf: + device-mapper "update". It was merged into LVM2-2.02.67 upstream in 20= 10. + Bug #398467 is wrong for the device-mapper update. + 09 Feb 2012; Robin H. Johnson defaults/initrd.scr= ipts, defaults/linuxrc: Dogfooding of the /usr mount code with the matching OpenRC change to m= ake the diff --git a/gen_cmdline.sh b/gen_cmdline.sh index 2e68882..184db65 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -295,8 +295,8 @@ parse_cmdline() { CMD_DMRAID=3D`parse_optbool "$*"` if [ "$CMD_DMRAID" =3D "1" -a ! -e /usr/include/libdevmapper.h ] then - echo 'Error: --dmraid requires device-mapper to be installed' - echo ' on the host system; try "emerge device-mapper".' + echo 'Error: --dmraid requires LVM2 to be installed' + echo ' on the host system; try "emerge lvm2".' exit 1 fi print_info 2 "CMD_DMRAID: ${CMD_DMRAID}" @@ -309,8 +309,8 @@ parse_cmdline() { CMD_MULTIPATH=3D`parse_optbool "$*"` if [ "$CMD_MULTIPATH" =3D "1" -a ! -e /usr/include/libdevmapper.h ] then - echo 'Error: --multipath requires device-mapper to be installed' - echo ' on the host;system; try "emerge device-mapper".' + echo 'Error: --multipath requires LVM2 to be installed' + echo ' on the host;system; try "emerge lvm2".' exit 1 fi print_info 2 "CMD_MULTIPATH: ${CMD_MULTIPATH}" diff --git a/gen_compile.sh b/gen_compile.sh index 68dabdb..aa0f04c 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -551,38 +551,7 @@ compile_dmraid() { } =20 compile_device_mapper() { - if [ ! -f "${DEVICE_MAPPER_BINCACHE}" ] - then - [ ! -f "${DEVICE_MAPPER_SRCTAR}" ] && - gen_die "Could not find device-mapper source tarball: ${DEVICE_MAPPER= _SRCTAR}. Please place it there, or place another version, changing /etc/= genkernel.conf as necessary!" - cd "${TEMP}" - rm -rf "${DEVICE_MAPPER_DIR}" - /bin/tar -zxpf "${DEVICE_MAPPER_SRCTAR}" - [ ! -d "${DEVICE_MAPPER_DIR}" ] && - gen_die "device-mapper directory ${DEVICE_MAPPER_DIR} invalid" - cd "${DEVICE_MAPPER_DIR}" - apply_patches device-mapper ${DEVICE_MAPPER_VER} - CFLAGS=3D"-fPIC" \ - ./configure --prefix=3D${TEMP}/device-mapper --enable-static_link \ - --disable-selinux >> ${LOGFILE} 2>&1 || - gen_die 'Configuring device-mapper failed!' - print_info 1 'device-mapper: >> Compiling...' - compile_generic '' utils - compile_generic 'install' utils - print_info 1 ' >> Copying to cache...' - cd "${TEMP}" - rm -rf "${TEMP}/device-mapper/man" || - gen_die 'Could not remove manual pages!' - strip "${TEMP}/device-mapper/sbin/dmsetup" || - gen_die 'Could not strip dmsetup binary!' - /bin/tar -jcpf "${DEVICE_MAPPER_BINCACHE}" device-mapper || - gen_die 'Could not tar up the device-mapper binary!' - [ -f "${DEVICE_MAPPER_BINCACHE}" ] || - gen_die 'device-mapper cache not created!' - cd "${TEMP}" - rm -rf "${DEVICE_MAPPER_DIR}" > /dev/null - rm -rf "${TEMP}/device-mapper" > /dev/null - fi + compile_lvm } =20 compile_e2fsprogs() { diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 4a21530..bbff166 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -138,7 +138,6 @@ determine_real_args() { =20 CACHE_DIR=3D`arch_replace "${CACHE_DIR}"` BUSYBOX_BINCACHE=3D`cache_replace "${BUSYBOX_BINCACHE}"` - DEVICE_MAPPER_BINCACHE=3D`cache_replace "${DEVICE_MAPPER_BINCACHE}"` LVM_BINCACHE=3D`cache_replace "${LVM_BINCACHE}"` MDADM_BINCACHE=3D`cache_replace "${MDADM_BINCACHE}"` DMRAID_BINCACHE=3D`cache_replace "${DMRAID_BINCACHE}"` @@ -151,7 +150,6 @@ determine_real_args() { DEFAULT_KERNEL_CONFIG=3D`arch_replace "${DEFAULT_KERNEL_CONFIG}"` BUSYBOX_CONFIG=3D`arch_replace "${BUSYBOX_CONFIG}"` BUSYBOX_BINCACHE=3D`arch_replace "${BUSYBOX_BINCACHE}"` - DEVICE_MAPPER_BINCACHE=3D`arch_replace "${DEVICE_MAPPER_BINCACHE}"` LVM_BINCACHE=3D`arch_replace "${LVM_BINCACHE}"` MDADM_BINCACHE=3D`arch_replace "${MDADM_BINCACHE}"` DMRAID_BINCACHE=3D`arch_replace "${DMRAID_BINCACHE}"` diff --git a/gen_funcs.sh b/gen_funcs.sh index 3beabd7..739311b 100755 --- a/gen_funcs.sh +++ b/gen_funcs.sh @@ -494,7 +494,7 @@ set_config_with_override() { } =20 check_distfiles() { - for i in $BUSYBOX_SRCTAR $DEVICE_MAPPER_SRCTAR $MULTIPATH_SRCTAR $LVM_S= RCTAR $DMRAID_SRCTAR $E2FSPROGS_SRCTAR $ISCSI_SRCTAR $GPG_SRCTAR + for i in $BUSYBOX_SRCTAR $MULTIPATH_SRCTAR $LVM_SRCTAR $DMRAID_SRCTAR $= E2FSPROGS_SRCTAR $ISCSI_SRCTAR $GPG_SRCTAR do if [ ! -f "${i}" ] then diff --git a/genkernel.conf b/genkernel.conf index 22b18d7..1e4bb31 100644 --- a/genkernel.conf +++ b/genkernel.conf @@ -205,11 +205,6 @@ BUSYBOX_DIR=3D"busybox-${BUSYBOX_VER}" BUSYBOX_BINCACHE=3D"%%CACHE%%/busybox-${BUSYBOX_VER}-%%ARCH%%.tar.bz2" #BUSYBOX_APPLETS=3D"[ ash sh mount uname echo cut cat" =20 -DEVICE_MAPPER_VER=3D"VERSION_DMAP" -DEVICE_MAPPER_DIR=3D"device-mapper.${DEVICE_MAPPER_VER}" -DEVICE_MAPPER_SRCTAR=3D"${DISTDIR}/device-mapper.${DEVICE_MAPPER_VER}.tg= z" -DEVICE_MAPPER_BINCACHE=3D"%%CACHE%%/device-mapper-${DEVICE_MAPPER_VER}-%= %ARCH%%.tar.bz2" - LVM_VER=3D"VERSION_LVM" LVM_DIR=3D"LVM2.${LVM_VER}" LVM_SRCTAR=3D"${DISTDIR}/LVM2.${LVM_VER}.tgz"