aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Thibodeau <kyron@neuralbs.com>2008-08-17 22:32:31 -0400
committerEric Thibodeau <kyron@neuralbs.com>2008-08-17 22:32:31 -0400
commit268f2cc6d609b739183499ba5484f26bef9d5c12 (patch)
tree1f96a45c120b46d50905390a9d99995166827442
parentTrivial update to README (diff)
downloadclustering-livecd-268f2cc6d609b739183499ba5484f26bef9d5c12.tar.gz
clustering-livecd-268f2cc6d609b739183499ba5484f26bef9d5c12.tar.bz2
clustering-livecd-268f2cc6d609b739183499ba5484f26bef9d5c12.zip
Added a patch to attempt to disable bootsplash from being included on the livecd (minimal)
ssentially genkernel's --no-splash options doesn't works.
-rw-r--r--overlay/sys-kernel/genkernel/Manifest9
-rw-r--r--overlay/sys-kernel/genkernel/files/genkernel-nosplash.patch14
-rw-r--r--overlay/sys-kernel/genkernel/files/genkernel.bash73
-rw-r--r--overlay/sys-kernel/genkernel/genkernel-3.4.10-r2.ebuild128
4 files changed, 224 insertions, 0 deletions
diff --git a/overlay/sys-kernel/genkernel/Manifest b/overlay/sys-kernel/genkernel/Manifest
new file mode 100644
index 0000000..f30cf59
--- /dev/null
+++ b/overlay/sys-kernel/genkernel/Manifest
@@ -0,0 +1,9 @@
+AUX genkernel-nosplash.patch 354 RMD160 55f33550b4455349658b98daf0666556aa8efb13 SHA1 48fc3ce57cafbe471d20d7d05b225480761aef77 SHA256 dd7cb079f35d119e1a044a7ff5fe34cf3193d417c399d1083e495ab443e6b82c
+AUX genkernel.bash 2438 RMD160 b3d8e4436d8768c07d18c5aaff9c14fc16641729 SHA1 e15a9c6ef506aa6872a6a97d26751246dedded04 SHA256 e7de9771ba79ef878e2c9a21a1c1720f092c6047d3cc7d4a49ff6b90e7e2c248
+DIST LVM2.2.02.28.tgz 531905 RMD160 bf6f25db6e34bf362353ae9557691a7f01962502 SHA1 6eb2f6e1228b017ad23d0b7f2bb12fd113f96616 SHA256 2d8d7b123e427d0bfb7471d7c17dfd88890eb98257ca22ea3be5d7307e83aceb
+DIST busybox-1.7.4.tar.bz2 1727940 RMD160 a4b71a246449f88a59acda6ecf019f66b9b7c19b SHA1 e5dcaa25525ca63663c3d4e7027897fed54a4f95 SHA256 8480a7c1b9ac0fddff55e8daae807ccf0a47aa292137fa8c9f97cf0733b459c7
+DIST device-mapper.1.02.22.tgz 189726 RMD160 8bf9986536c49f53c398d6a2180e21e1235bea18 SHA1 a4533872c32951a1b549bb9207a13b7e4dae0701 SHA256 ff833a6cd6246686f5b3f5692fd6597f1ffbc60f08929e5fe68304cdafb61595
+DIST dmraid-1.0.0.rc14.tar.bz2 164234 RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c SHA1 2b3284db46a995967d88993ae5ae36b57c513bc4 SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec
+DIST e2fsprogs-1.39.tar.gz 3695111 RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b SHA1 c2dad0c9bd76701eafe3804e2a7d072aa198f046 SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3
+DIST genkernel-3.4.10.tar.bz2 210822 RMD160 19327712c7140336db08a466a19f164df11eac7a SHA1 a672b1b81c6b607533f2576f4bf3adaf620f9f54 SHA256 43e7ae3495e5f8e4ead919b059444bfa393bf83d36c14390206892f82ad37685
+EBUILD genkernel-3.4.10-r2.ebuild 4286 RMD160 6315f8251d406d54d1dfab27c8f39b908c92f221 SHA1 d0328492cd2e69cd1e703c42e41007b45c64370d SHA256 f5775e785f042fd23e36f2fe20aba0102de044d1fd823769744b32e256e5fa80
diff --git a/overlay/sys-kernel/genkernel/files/genkernel-nosplash.patch b/overlay/sys-kernel/genkernel/files/genkernel-nosplash.patch
new file mode 100644
index 0000000..9f2fe40
--- /dev/null
+++ b/overlay/sys-kernel/genkernel/files/genkernel-nosplash.patch
@@ -0,0 +1,14 @@
+--- gen_initramfs.sh 2008-06-05 12:47:56.000000000 -0400
++++ gen_initramfs.sh.new 2008-08-17 18:31:58.563156911 -0400
+@@ -476,7 +476,10 @@
+ fi
+
+ append_data 'blkid' "${DISKLABEL}"
+- append_data 'splash' "${SPLASH}"
++ if isTrue "${SPLASH}"
++ then
++ append_data 'splash' "${SPLASH}"
++ fi
+
+ if isTrue "${FIRMWARE}" && [ -n "${FIRMWARE_DIR}" ]
+ then
diff --git a/overlay/sys-kernel/genkernel/files/genkernel.bash b/overlay/sys-kernel/genkernel/files/genkernel.bash
new file mode 100644
index 0000000..ed6b1c1
--- /dev/null
+++ b/overlay/sys-kernel/genkernel/files/genkernel.bash
@@ -0,0 +1,73 @@
+# genkernel (8) completion
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Written by Aron Griffis <agriffis@gentoo.org>
+
+_genkernel()
+{
+ declare cur prev genkernel_help actions params
+ COMPREPLY=()
+ cur=${COMP_WORDS[COMP_CWORD]}
+ prev=${COMP_WORDS[COMP_CWORD-1]}
+
+ # extract initial list of params/actions from genkernel --help
+ genkernel_help=$(command genkernel --help)
+ actions=( $(<<<"$genkernel_help" sed -n \
+ '/^Available Actions:/,/^$/s/^[[:space:]]\+\([^[:space:]]\+\).*/\1/p') )
+ params=( $(<<<"$genkernel_help" egrep -oe '--[^[:space:]]{2,}') )
+
+ # attempt to complete the current parameter based on the list
+ COMPREPLY=($(compgen -W "${params[*]/=*/=} ${actions[*]}" -- "$cur"))
+
+ # if we don't have a rhs to complete
+ if [[ ${#COMPREPLY[@]} -gt 1 ]]; then
+ return
+ elif [[ ${#COMPREPLY[@]} -eq 0 && $cur != --*=* ]]; then
+ return
+ elif [[ ${#COMPREPLY[@]} -eq 1 && $COMPREPLY != --*= ]]; then
+ # using nospace completion, add an explicit space
+ COMPREPLY="${COMPREPLY} "
+ return
+ fi
+
+ # we have a unique lhs and need to complete the rhs
+ declare args lhs rhs
+ if [[ ${#COMPREPLY[@]} -eq 1 ]]; then
+ lhs=$COMPREPLY
+ else
+ lhs=${cur%%=*}=
+ rhs=${cur#*=}
+ fi
+
+ # genkernel's help gives clues as to what belongs on the rhs.
+ # extract the clue for the current parameter
+ args=" ${params[*]} "
+ args="${args##* $lhs}"
+ args="${args%% *}"
+
+ # generate a list of completions for the argument; this replaces args with
+ # an array of results
+ args=( $(case $args in
+ ('<0-5>') compgen -W "$(echo {1..5})" -- "$rhs" ;;
+ ('<outfile>'|'<file>') compgen -A file -o plusdirs -- "$rhs" ;;
+ ('<dir>') compgen -A directory -S / -- "$rhs" ;;
+ ('<tbz2>') compgen -G '*.tbz2' -G '*.tar.bz2' -o plusdirs -- "$rhs" ;;
+ (*) compgen -o bashdefault -- "$rhs" ;; # punt
+ esac) )
+
+ # we're using nospace completion to prevent spaces after paths that aren't
+ # "done" yet. So do some hacking to the args to add spaces after
+ # non-directories.
+ declare slash=/
+ args=( "${args[@]/%/ }" ) # add space to all
+ args=( "${args[@]/%$slash /$slash}" ) # remove space from dirs
+
+ # recreate COMPREPLY
+ if [[ $cur == "$lhs"* ]]; then
+ COMPREPLY=( "${args[@]}" )
+ elif [[ ${#args[@]} -gt 0 ]]; then
+ COMPREPLY=( "${args[@]/#/$lhs}" )
+ fi
+}
+
+complete -o nospace -F _genkernel genkernel
diff --git a/overlay/sys-kernel/genkernel/genkernel-3.4.10-r2.ebuild b/overlay/sys-kernel/genkernel/genkernel-3.4.10-r2.ebuild
new file mode 100644
index 0000000..5e71392
--- /dev/null
+++ b/overlay/sys-kernel/genkernel/genkernel-3.4.10-r2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.10-r1.ebuild,v 1.2 2008/06/26 17:39:57 wolf31o2 Exp $
+
+# genkernel-9999 -> latest SVN
+# genkernel-9999.REV -> use SVN REV
+# genkernel-VERSION -> normal genkernel release
+
+VERSION_BUSYBOX='1.7.4'
+VERSION_DMAP='1.02.22'
+VERSION_DMRAID='1.0.0.rc14'
+VERSION_E2FSPROGS='1.39'
+VERSION_LVM='2.02.28'
+
+MY_HOME="http://dev.gentoo.org/~wolf31o2"
+RH_HOME="ftp://sources.redhat.com/pub"
+DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="http://www.busybox.net/downloads"
+
+COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
+ ${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
+ ${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+ ${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+ ${RH_HOME}/dm/device-mapper.${VERSION_DMAP}.tgz
+ ${RH_HOME}/dm/old/device-mapper.${VERSION_DMAP}.tgz
+ ${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+ mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz"
+
+if [[ ${PV} == 9999* ]]
+then
+ [[ ${PV} == 9999.* ]] && ESVN_UPDATE_CMD="svn up -r ${PV/9999./}"
+ ESVN_REPO_URI="svn://anonsvn.gentoo.org/genkernel/trunk"
+ inherit subversion bash-completion eutils
+ S=${WORKDIR}/trunk
+ SRC_URI="${COMMON_URI}"
+else
+ inherit bash-completion eutils
+ SRC_URI="mirror://gentoo/${P}.tar.bz2
+ ${MY_HOME}/sources/genkernel/${P}.tar.bz2
+ ${COMMON_URI}"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+# Please don't touch individual KEYWORDS. Since this is maintained/tested by
+# Release Engineering, it's easier for us to deal with all arches at once.
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+#KEYWORDS=""
+IUSE="ibm selinux"
+
+DEPEND="sys-fs/e2fsprogs
+ selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND} app-arch/cpio"
+
+src_unpack() {
+ if [[ ${PV} == 9999* ]] ; then
+ subversion_src_unpack
+ else
+ unpack ${P}.tar.bz2
+ fi
+ use selinux && sed -i 's/###//g' gen_compile.sh
+
+ cd "${S}"
+ epatch ${FILESDIR}/genkernel-nosplash.patch
+}
+
+src_install() {
+ # This block updates genkernel.conf
+ sed -e "s:VERSION_DMAP:$VERSION_DMAP:" \
+ -e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+ -e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \
+ -e "s:VERSION_LVM:$VERSION_LVM:" \
+ -e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+ "${S}"/genkernel.conf > "${T}"/genkernel.conf \
+ || die "Could not adjust versions"
+ insinto /etc
+ doins "${T}"/genkernel.conf || die "doins genkernel.conf"
+
+ doman genkernel.8 || die "doman"
+ dodoc AUTHORS ChangeLog README TODO || die "dodoc"
+
+ dobin genkernel || die "dobin genkernel"
+
+ rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+ insinto /usr/share/genkernel
+ doins -r "${S}"/* || die "doins"
+ use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
+ cp "${S}"/ppc64/kernel-2.6.g5 "${S}"/ppc64/kernel-2.6
+
+ # Copy files to /var/cache/genkernel/src
+ elog "Copying files to /var/cache/genkernel/src..."
+ mkdir -p "${D}"/var/cache/genkernel/src
+ cp -f \
+ "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
+ "${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
+ "${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \
+ "${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
+ "${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
+ "${D}"/var/cache/genkernel/src || die "Copying distfiles..."
+
+ dobashcompletion "${FILESDIR}"/genkernel.bash
+}
+
+pkg_postinst() {
+ echo
+ elog 'Documentation is available in the genkernel manual page'
+ elog 'as well as the following URL:'
+ echo
+ elog 'http://www.gentoo.org/doc/en/genkernel.xml'
+ echo
+ ewarn "This package is known to not work with reiser4. If you are running"
+ ewarn "reiser4 and have a problem, do not file a bug. We know it does not"
+ ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
+ ewarn "broken in this regard. Try using a sane filesystem like ext3 or"
+ ewarn "even reiser3."
+ echo
+ ewarn "The LUKS support has changed from versions prior to 3.4.4. Now,"
+ ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
+ echo
+
+ bash-completion_pkg_postinst
+}