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 1QdSRr-00057h-8v for garchives@archives.gentoo.org; Sun, 03 Jul 2011 19:35:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CD8D21C04D; Sun, 3 Jul 2011 19:35:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9A4DC21C051 for ; Sun, 3 Jul 2011 19:35:06 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 25C551B4019 for ; Sun, 3 Jul 2011 18:59:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 84CC58003D for ; Sun, 3 Jul 2011 18:59:27 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: Subject: [gentoo-commits] proj/genkernel:master commit in: /, arch/sparc64/, arch/ppc/, arch/ppc64/, arch/um/, arch/x86_64/, arch/ia64/, ... X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog arch/alpha/modules_load arch/arm/modules_load arch/ia64/modules_load arch/mips/modules_load arch/parisc/modules_load arch/parisc64/modules_load arch/ppc/modules_load arch/ppc64/modules_load arch/sparc/modules_load arch/sparc64/modules_load arch/um/modules_load arch/x86/modules_load arch/x86_64/modules_load defaults/initrd.defaults defaults/initrd.scripts defaults/linuxrc defaults/modules_load doc/genkernel.8.txt gen_cmdline.sh gen_determineargs.sh gen_initramfs.sh genkernel genkernel.conf maintenance/docmatcher.py X-VCS-Directories: / arch/sparc64/ arch/ppc64/ arch/ppc/ arch/um/ arch/x86_64/ arch/ia64/ maintenance/ arch/parisc64/ arch/x86/ doc/ arch/alpha/ arch/arm/ arch/sparc/ arch/parisc/ defaults/ arch/mips/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: bf0cad6a30b2344a3abb6cbeb805b27ba7708c96 Date: Sun, 3 Jul 2011 18:59:27 +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: X-Archives-Hash: 3734cc30dbb6e7cf4d684ed80e8201f5 commit: bf0cad6a30b2344a3abb6cbeb805b27ba7708c96 Author: Sebastian Pipping pipping org> AuthorDate: Sun Jul 3 18:56:05 2011 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Sun Jul 3 18:57:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3Dbf0cad6a Remove support for sys-fs/evms, as it was removed from Gentoo (bug #37242= 3) --- ChangeLog | 11 +++++++++ arch/alpha/modules_load | 1 - arch/arm/modules_load | 1 - arch/ia64/modules_load | 1 - arch/mips/modules_load | 1 - arch/parisc/modules_load | 1 - arch/parisc64/modules_load | 1 - arch/ppc/modules_load | 1 - arch/ppc64/modules_load | 1 - arch/sparc/modules_load | 1 - arch/sparc64/modules_load | 1 - arch/um/modules_load | 1 - arch/x86/modules_load | 1 - arch/x86_64/modules_load | 1 - defaults/initrd.defaults | 2 +- defaults/initrd.scripts | 18 -------------- defaults/linuxrc | 7 ----- defaults/modules_load | 1 - doc/genkernel.8.txt | 7 ----- gen_cmdline.sh | 13 ---------- gen_determineargs.sh | 1 - gen_initramfs.sh | 54 --------------------------------------= ------ genkernel | 1 - genkernel.conf | 4 --- maintenance/docmatcher.py | 2 +- 25 files changed, 13 insertions(+), 121 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80850ae..862e001 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,17 @@ # Distributed under the GPL v2 # $Id$ =20 + 03 Jul 2011; Sebastian Pipping arch/alpha/modules_l= oad, + arch/arm/modules_load, arch/ia64/modules_load, arch/mips/modules_load, + arch/parisc/modules_load, arch/parisc64/modules_load, arch/ppc/modules= _load, + arch/ppc64/modules_load, arch/sparc/modules_load, arch/sparc64/modules= _load, + arch/um/modules_load, arch/x86/modules_load, arch/x86_64/modules_load, + defaults/initrd.defaults, defaults/initrd.scripts, defaults/linuxrc, + defaults/modules_load, doc/genkernel.8.txt, gen_cmdline.sh, + gen_determineargs.sh, gen_initramfs.sh, genkernel, genkernel.conf, + maintenance/docmatcher.py: + Remove support for sys-fs/evms, as it was removed from Gentoo (bug #37= 2423) + 22 Jun 2011; Sebastian Pipping gen_compile.sh: Make --arch-override=3D affect "make menuconfig" (bug #247246) =20 diff --git a/arch/alpha/modules_load b/arch/alpha/modules_load index faf099d..731dbf4 100644 --- a/arch/alpha/modules_load +++ b/arch/alpha/modules_load @@ -3,7 +3,6 @@ # RAID MODULES_ATARAID=3D"ataraid pdcraid hptraid" MODULES_DMRAID=3D"dm-mod dm-mirror" -MODULES_EVMS=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 = raid5 raid6 raid10" MODULES_LVM=3D"dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_MDADM=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456= raid5 raid6 raid10" =20 diff --git a/arch/arm/modules_load b/arch/arm/modules_load index cd14951..4b43271 100644 --- a/arch/arm/modules_load +++ b/arch/arm/modules_load @@ -3,7 +3,6 @@ # RAID MODULES_ATARAID=3D"ataraid pdcraid hptraid" MODULES_DMRAID=3D"dm-mod dm-mirror" -MODULES_EVMS=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 = raid5 raid6 raid10" MODULES_LVM=3D"dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_MDADM=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456= raid5 raid6 raid10" =20 diff --git a/arch/ia64/modules_load b/arch/ia64/modules_load index 51bdc14..b323538 100644 --- a/arch/ia64/modules_load +++ b/arch/ia64/modules_load @@ -3,7 +3,6 @@ # RAID MODULES_ATARAID=3D"ataraid pdcraid hptraid" MODULES_DMRAID=3D"dm-mod dm-mirror" -MODULES_EVMS=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 = raid5 raid6 raid10" MODULES_LVM=3D"dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_MDADM=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456= raid5 raid6 raid10" =20 diff --git a/arch/mips/modules_load b/arch/mips/modules_load index faf099d..731dbf4 100644 --- a/arch/mips/modules_load +++ b/arch/mips/modules_load @@ -3,7 +3,6 @@ # RAID MODULES_ATARAID=3D"ataraid pdcraid hptraid" MODULES_DMRAID=3D"dm-mod dm-mirror" -MODULES_EVMS=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 = raid5 raid6 raid10" MODULES_LVM=3D"dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_MDADM=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456= raid5 raid6 raid10" =20 diff --git a/arch/parisc/modules_load b/arch/parisc/modules_load index faf099d..731dbf4 100644 --- a/arch/parisc/modules_load +++ b/arch/parisc/modules_load @@ -3,7 +3,6 @@ # RAID MODULES_ATARAID=3D"ataraid pdcraid hptraid" MODULES_DMRAID=3D"dm-mod dm-mirror" -MODULES_EVMS=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 = raid5 raid6 raid10" MODULES_LVM=3D"dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_MDADM=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456= raid5 raid6 raid10" =20 diff --git a/arch/parisc64/modules_load b/arch/parisc64/modules_load index 51bdc14..b323538 100644 --- a/arch/parisc64/modules_load +++ b/arch/parisc64/modules_load @@ -3,7 +3,6 @@ # RAID MODULES_ATARAID=3D"ataraid pdcraid hptraid" MODULES_DMRAID=3D"dm-mod dm-mirror" -MODULES_EVMS=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 = raid5 raid6 raid10" MODULES_LVM=3D"dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_MDADM=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456= raid5 raid6 raid10" =20 diff --git a/arch/ppc/modules_load b/arch/ppc/modules_load index faf099d..731dbf4 100644 --- a/arch/ppc/modules_load +++ b/arch/ppc/modules_load @@ -3,7 +3,6 @@ # RAID MODULES_ATARAID=3D"ataraid pdcraid hptraid" MODULES_DMRAID=3D"dm-mod dm-mirror" -MODULES_EVMS=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 = raid5 raid6 raid10" MODULES_LVM=3D"dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_MDADM=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456= raid5 raid6 raid10" =20 diff --git a/arch/ppc64/modules_load b/arch/ppc64/modules_load index 51bdc14..b323538 100644 --- a/arch/ppc64/modules_load +++ b/arch/ppc64/modules_load @@ -3,7 +3,6 @@ # RAID MODULES_ATARAID=3D"ataraid pdcraid hptraid" MODULES_DMRAID=3D"dm-mod dm-mirror" -MODULES_EVMS=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 = raid5 raid6 raid10" MODULES_LVM=3D"dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_MDADM=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456= raid5 raid6 raid10" =20 diff --git a/arch/sparc/modules_load b/arch/sparc/modules_load index faf099d..731dbf4 100644 --- a/arch/sparc/modules_load +++ b/arch/sparc/modules_load @@ -3,7 +3,6 @@ # RAID MODULES_ATARAID=3D"ataraid pdcraid hptraid" MODULES_DMRAID=3D"dm-mod dm-mirror" -MODULES_EVMS=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 = raid5 raid6 raid10" MODULES_LVM=3D"dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_MDADM=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456= raid5 raid6 raid10" =20 diff --git a/arch/sparc64/modules_load b/arch/sparc64/modules_load index 51bdc14..b323538 100644 --- a/arch/sparc64/modules_load +++ b/arch/sparc64/modules_load @@ -3,7 +3,6 @@ # RAID MODULES_ATARAID=3D"ataraid pdcraid hptraid" MODULES_DMRAID=3D"dm-mod dm-mirror" -MODULES_EVMS=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 = raid5 raid6 raid10" MODULES_LVM=3D"dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_MDADM=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456= raid5 raid6 raid10" =20 diff --git a/arch/um/modules_load b/arch/um/modules_load index dfe4431..625a304 100644 --- a/arch/um/modules_load +++ b/arch/um/modules_load @@ -3,7 +3,6 @@ # RAID MODULES_ATARAID=3D"ataraid pdcraid hptraid" MODULES_DMRAID=3D"dm-mod dm-mirror" -MODULES_EVMS=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 = raid5 raid6 raid10" MODULES_LVM=3D"dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_MDADM=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456= raid5 raid6 raid10" =20 diff --git a/arch/x86/modules_load b/arch/x86/modules_load index 84ec83e..b7936bf 100644 --- a/arch/x86/modules_load +++ b/arch/x86/modules_load @@ -4,7 +4,6 @@ # RAID MODULES_ATARAID=3D"ataraid pdcraid hptraid" MODULES_DMRAID=3D"dm-mod dm-mirror dm-crypt" -MODULES_EVMS=3D"dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1= raid456 raid5 raid6 raid10" MODULES_LVM=3D"dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr" MODULES_MDADM=3D"dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid= 1 raid456 raid5 raid6 raid10" =20 diff --git a/arch/x86_64/modules_load b/arch/x86_64/modules_load index d553165..8bae053 100644 --- a/arch/x86_64/modules_load +++ b/arch/x86_64/modules_load @@ -3,7 +3,6 @@ # RAID MODULES_ATARAID=3D"ataraid pdcraid hptraid" MODULES_DMRAID=3D"dm-mod dm-mirror dm-crypt" -MODULES_EVMS=3D"dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1= raid456 raid5 raid6 raid10" MODULES_LVM=3D"dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr" MODULES_MDADM=3D"dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid= 1 raid456 raid5 raid6 raid10" =20 diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults index 72e8376..76d72a7 100755 --- a/defaults/initrd.defaults +++ b/defaults/initrd.defaults @@ -79,5 +79,5 @@ DEFAULT_NFSOPTIONS=3D"ro,nolock,rsize=3D1024,wsize=3D10= 24" =20 # Only sections that are in by default or those that # are not module groups need to be defined here... -HWOPTS=3D'keymap cache modules pata sata scsi usb firewire waitscan slow= usb evms lvm dmraid mdadm fs net' +HWOPTS=3D'keymap cache modules pata sata scsi usb firewire waitscan slow= usb lvm dmraid mdadm fs net' MY_HWOPTS=3D'modules pata sata scsi slowusb usb firewire waitscan dmraid= mdadm fs net iscsi' diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 37a7eb4..b908ba0 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -660,28 +660,10 @@ startVolumes() { # And finally execute it all (/proc/... needed if lvm is compiled wit= hout readline) good_msg "Scanning for and activating Volume Groups" printf "%b\n" "${lvm_commands}" | /bin/lvm /proc/self/fd/0 - - # Disable EVMS since lvm is activated and they dont work together. - if [ "${USE_EVMS_NORMAL}" =3D '1' ] - then - bad_msg "Disabling EVMS Support because LVM started" - bad_msg "Do not add dolvm to the cmdline if this is not what you wan= t" - bad_msg "LVM and EVMS do not work well together" - USE_EVMS_NORMAL=3D0 - fi else bad_msg "vgscan or vgchange not found: skipping LVM volume group acti= vation!" fi fi - - if [ "${USE_EVMS_NORMAL}" =3D '1' ] - then - if [ -e '/sbin/evms_activate' ] - then - good_msg "Activating EVMS" - evms_activate - fi - fi } =20 startiscsi() { diff --git a/defaults/linuxrc b/defaults/linuxrc index 57f26fd..0843f5d 100755 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -96,13 +96,6 @@ do DMRAID_OPTS=3D`parse_opt "${x}"` USE_DMRAID_NORMAL=3D1 ;; - doevms) - USE_EVMS_NORMAL=3D1 - ;; - doevms2) - bad_msg 'Using doevms2 is deprecated, use doevms, instead.' - USE_EVMS_NORMAL=3D1 - ;; # Debug Options debug) DEBUG=3D'yes' diff --git a/defaults/modules_load b/defaults/modules_load index 31f534b..269a40c 100644 --- a/defaults/modules_load +++ b/defaults/modules_load @@ -3,7 +3,6 @@ # RAID MODULES_ATARAID=3D"ataraid pdcraid hptraid" MODULES_DMRAID=3D"dm-mod dm-mirror" -MODULES_EVMS=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 = raid5 raid6 raid10" MODULES_LVM=3D"dm-mod dm-snapshot dm-mirror dm-bbr" MODULES_MDADM=3D"dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456= raid5 raid6 raid10" =20 diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt index 54cb411..2d7f775 100644 --- a/doc/genkernel.8.txt +++ b/doc/genkernel.8.txt @@ -236,10 +236,6 @@ INITIALIZATION *--no-keymap*:: Disables keymap selection at boot. =20 -*--evms*:: - Add in EVMS support from static binaries if they exist on the system= : - you should run "emerge evms" first (in the host system). - *--lvm*:: Add in LVM support from static binaries if they exist on the system, or compile static LVM binaries if static ones do not @@ -417,9 +413,6 @@ which the ramdisk scripts would recognize. location. Otherwise the location will be deduced from the DCHP request (option root-path) =20 -*doevms*:: - Activate EVMS volumes on bootup - *dolvm*:: Activate LVM volumes on bootup =20 diff --git a/gen_cmdline.sh b/gen_cmdline.sh index 9e4009e..f7eb707 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -75,9 +75,6 @@ longusage() { echo " --splash-res=3D Select splash theme resolutions to install= " echo " --do-keymap-auto Forces keymap selection at boot" echo " --no-keymap Disables keymap selection support" - echo " --evms Include EVMS support" - echo " --> 'emerge evms' in the host operating system" - echo " first" echo " --lvm Include LVM support" echo " --mdadm Include MDADM/MDMON support" echo " --mdadm-config=3D Use file as mdadm.conf in initramfs" @@ -224,16 +221,6 @@ parse_cmdline() { CMD_KEYMAP=3D0 print_info 2 "CMD_KEYMAP: ${CMD_KEYMAP}" ;; - --evms) - CMD_EVMS=3D1 - print_info 2 "CMD_EVMS: ${CMD_EVMS}" - ;; - --evms2) - CMD_EVMS=3D1 - print_info 2 "CMD_EVMS: ${CMD_EVMS}" - echo - print_warning 1 "Please use --evms, as --evms2 is deprecated." - ;; --lvm) CMD_LVM=3D1 print_info 2 "CMD_LVM: ${CMD_LVM}" diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 6f88805..ce479cb 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -108,7 +108,6 @@ determine_real_args() { set_config_with_override STRING INSTALL_MOD_PATH CMD_INSTALL_MOD_PA= TH set_config_with_override BOOL OLDCONFIG CMD_OLDCONFIG set_config_with_override BOOL LVM CMD_LVM - set_config_with_override BOOL EVMS CMD_EVMS set_config_with_override BOOL DMRAID CMD_DMRAID set_config_with_override BOOL ISCSI CMD_ISCSI set_config_with_override BOOL BUSYBOX CMD_BUSYBOX = "yes" diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 543f484..7fe4421 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -279,59 +279,6 @@ append_lvm(){ rm -r "${TEMP}/initramfs-lvm-temp/" } =20 -append_evms(){ - if [ -d "${TEMP}/initramfs-evms-temp" ] - then - rm -r "${TEMP}/initramfs-evms-temp/" - fi - mkdir -p "${TEMP}/initramfs-evms-temp/lib/evms" - mkdir -p "${TEMP}/initramfs-evms-temp/etc/" - mkdir -p "${TEMP}/initramfs-evms-temp/bin/" - mkdir -p "${TEMP}/initramfs-evms-temp/sbin/" - if [ "${EVMS}" =3D '1' ] - then - print_info 1 ' EVMS: Adding support...' - mkdir -p ${TEMP}/initramfs-evms-temp/lib - cp -a /lib/ld-* "${TEMP}/initramfs-evms-temp/lib" \ - || gen_die 'Could not copy files for EVMS!' - if [ -n "`ls /lib/libgcc_s*`" ] - then - cp -a /lib/libgcc_s* "${TEMP}/initramfs-evms-temp/lib" \ - || gen_die 'Could not copy files for EVMS!' - fi - cp -a /lib/libc-* /lib/libc.* "${TEMP}/initramfs-evms-temp/lib" \ - || gen_die 'Could not copy files for EVMS!' - cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initramfs-evms-temp/lib" \ - || gen_die 'Could not copy files for EVMS!' - cp -a /lib/libpthread* "${TEMP}/initramfs-evms-temp/lib" \ - || gen_die 'Could not copy files for EVMS!' - cp -a /lib/libuuid*so* "${TEMP}/initramfs-evms-temp/lib" \ - || gen_die 'Could not copy files for EVMS!' - cp -a /lib/libevms*so* "${TEMP}/initramfs-evms-temp/lib" \ - || gen_die 'Could not copy files for EVMS!' - cp -a /lib/evms "${TEMP}/initramfs-evms-temp/lib" \ - || gen_die 'Could not copy files for EVMS!' - cp -a /lib/evms/* "${TEMP}/initramfs-evms-temp/lib/evms" \ - || gen_die 'Could not copy files for EVMS!' - cp -a /etc/evms.conf "${TEMP}/initramfs-evms-temp/etc" \ - || gen_die 'Could not copy files for EVMS!' - cp /sbin/evms_activate "${TEMP}/initramfs-evms-temp/sbin" \ - || gen_die 'Could not copy over evms_activate!' - - # Fix EVMS complaining that it can't find the swap utilities. - # These are not required in the initramfs - for swap_libs in "${TEMP}/initramfs-evms-temp/lib/evms/*/swap*.so" - do - rm ${swap_libs} - done - fi - cd "${TEMP}/initramfs-evms-temp/" - find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ - || gen_die "compressing evms cpio" - cd "${TEMP}" - rm -r "${TEMP}/initramfs-evms-temp/" -} - append_mdadm(){ if [ -d "${TEMP}/initramfs-mdadm-temp" ] then @@ -676,7 +623,6 @@ create_initramfs() { append_data 'lvm' "${LVM}" append_data 'dmraid' "${DMRAID}" append_data 'iscsi' "${ISCSI}" - append_data 'evms' "${EVMS}" append_data 'mdadm' "${MDADM}" append_data 'luks' "${LUKS}" append_data 'multipath' "${MULTIPATH}" diff --git a/genkernel b/genkernel index f72cf43..38e445f 100755 --- a/genkernel +++ b/genkernel @@ -348,7 +348,6 @@ then print_warning 1 'Additional kernel cmdline arguments that *may* be requ= ired to boot properly...' [ "${SPLASH}" =3D '1' ] && print_warning 1 "add \"vga=3D791 splash=3Dsi= lent,theme:${SPLASH_THEME} console=3Dtty1 quiet\" if you use a splash fra= mebuffer ]" [ "${LVM}" =3D '1' ] && print_warning 1 'add "dolvm" for lvm support' - [ "${EVMS}" =3D '1' ] && print_warning 1 'add "doevms" for evms support= ' [ "${DMRAID}" =3D '1' ] && print_warning 1 'add "dodmraid" for dmraid s= upport' [ "${MDADM}" =3D '1' ] && print_warning 1 'add "domdadm" for RAID suppo= rt' [ "${DMRAID}" =3D '1' ] && print_warning 1 ' or "dodmraid=3D"' diff --git a/genkernel.conf b/genkernel.conf index 420eb93..24fcd54 100644 --- a/genkernel.conf +++ b/genkernel.conf @@ -62,10 +62,6 @@ USECOLOR=3D"yes" # Add in GnuPG support # GPG=3D"no" =20 -# Add in EVMS support from static binaries if they exist on the system: = you -# should run "emerge evms" first. -# EVMS=3D"no" - # Add DMRAID support. # DMRAID=3D"no" =20 diff --git a/maintenance/docmatcher.py b/maintenance/docmatcher.py index 848774a..6ba2cf9 100644 --- a/maintenance/docmatcher.py +++ b/maintenance/docmatcher.py @@ -27,7 +27,7 @@ EXTRA_VARIABLES =3D tuple(EXTRA_VARIABLES) IGNORE_OPTIONS =3D ('help', 'version') _GPG_PARAMETERS =3D ('symmetric', ) IGNORE_PARAMETERS =3D _GPG_PARAMETERS -DEPRECATED_PARAMETERS =3D ('lvm2', 'evms2', 'gensplash', 'gensplash-res'= ) +DEPRECATED_PARAMETERS =3D ('lvm2', 'gensplash', 'gensplash-res') =20 =20 def exract_gen_cmdline_sh():