diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2008-02-14 03:47:41 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2008-02-14 03:47:41 +0000 |
| commit | 9fb62316efa77734a297200d023a6b992d79e208 (patch) | |
| tree | 6db2f7fc800b25614d92612252c4cbc0372ecf1a | |
| parent | Updated ebuild to use more built-ins versus using cp directly. (diff) | |
| download | wolf31o2-9fb62316efa77734a297200d023a6b992d79e208.tar.gz wolf31o2-9fb62316efa77734a297200d023a6b992d79e208.tar.bz2 wolf31o2-9fb62316efa77734a297200d023a6b992d79e208.zip | |
OK. I found the bug in my new ebuild. Let's test it so we can get it into the tree.
svn path=/; revision=113
| -rw-r--r-- | sys-kernel/genkernel/genkernel-3.4.10_pre1.ebuild | 2 | ||||
| -rw-r--r-- | sys-kernel/genkernel/genkernel-9999.ebuild | 28 |
2 files changed, 14 insertions, 16 deletions
diff --git a/sys-kernel/genkernel/genkernel-3.4.10_pre1.ebuild b/sys-kernel/genkernel/genkernel-3.4.10_pre1.ebuild index 8404048..bffda35 100644 --- a/sys-kernel/genkernel/genkernel-3.4.10_pre1.ebuild +++ b/sys-kernel/genkernel/genkernel-3.4.10_pre1.ebuild @@ -85,7 +85,7 @@ src_install() { rm -f genkernel.8 ChangeLog README TODO genkernel.conf insinto /usr/share/genkernel - doins -r "${S}" || die "doins" + 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 diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild index 91f9ddf..a5cca0a 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-9999.ebuild @@ -35,7 +35,7 @@ else inherit bash-completion eutils SRC_URI="mirror://gentoo/${P}.tar.bz2 mirror://gentoo/${PN}-pkg-${VERSION_PKG}.tar.bz2 - ${MY_HOME}/sources/${PN}/${P}.tar.bz2 + ${MY_HOME}/${P}.tar.bz2 ${MY_HOME}/sources/${PN}/${PN}-pkg-${VERSION_PKG}.tar.bz2 ${COMMON_URI}" fi @@ -66,39 +66,37 @@ src_unpack() { unpack ${PN}-pkg-${VERSION_PKG}.tar.bz2 fi use selinux && sed -i 's/###//g' gen_compile.sh -# epatch "${FILESDIR}"/${P}-lvm2fix.patch } src_install() { - dodir /etc - cp "${S}"/genkernel.conf "${D}"/etc # This block updates genkernel.conf - sed -i -e "s:VERSION_DMAP:$VERSION_DMAP:" \ + 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_UNIONFS:$VERSION_UNIONFS:" \ - "${D}"/etc/genkernel.conf || die "Could not adjust versions" + "${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 ChangeLog README TODO || die "dodoc" + + rm -f genkernel.8 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 - rm -f "${S}"/genkernel.8 - doins -r "${S}" dodir /usr/bin dosym /usr/share/genkernel/genkernel /usr/bin/genkernel - rm -f "${D}"/usr/share/genkernel/genkernel.conf - dodoc README - - doman genkernel.8 - 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 \ - "${D}"/usr/share/genkernel/pkg + "${D}"/usr/share/genkernel/pkg || die "copying pkg" dobashcompletion "${FILESDIR}"/genkernel.bash } |