diff options
| author |   Roy Marples <roy@marples.name> | 2008-03-25 15:05:32 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-03-25 15:05:32 +0000 |
| commit | 0a6b71b6ec5b8b8d01b08823441738a6e4d6dbf0 (patch) | |
| tree | 943c219e715024b1ea6bd69ff98826445538a1a8 | |
| parent | Remove baselayout ebuild. (diff) | |
| download | uberlord-0a6b71b6ec5b8b8d01b08823441738a6e4d6dbf0.tar.gz uberlord-0a6b71b6ec5b8b8d01b08823441738a6e4d6dbf0.tar.bz2 uberlord-0a6b71b6ec5b8b8d01b08823441738a6e4d6dbf0.zip | |
Suck some of portage updates into our ebuild.
| -rw-r--r-- | sys-apps/openrc/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-9999.ebuild | 24 |
2 files changed, 23 insertions, 3 deletions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index cdc8f03..176587b 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -1 +1 @@ -EBUILD openrc-9999.ebuild 4121 RMD160 494be1e530bf261f74edd6b7dfd40754e0d42455 SHA1 2c70ee0ddc4b3f05e952211e903012d8c71af110 SHA256 1fb5ef9bc96a16b6b983be0fe88df054793bd89e865b11b762b0bcab3b2209eb +EBUILD openrc-9999.ebuild 4842 RMD160 9b17b798e3371d019d6487a5e5ad6cc0154ab7a8 SHA1 ea433310f384984bd9490083f3b3ce382a332b2b SHA256 5820e02aa006a9eb7b7836db47471a3fc762f097ef74a109eb682f636e184c7e diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index 9afaca6..afdea04 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -69,6 +69,15 @@ pkg_setup() { } src_compile() { + # catch people running `ebuild` w/out setup + if [ -z "${MAKE_ARGS}" ] ; then + die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?" + fi + + if [ "${PV}" = "9999" ] ; then + local ver="git-$(git --git-dir=${EGIT_STORE_DIR}/${EGIT_PROJECT} rev-parse --verify ${EGIT_BRANCH} | cut -c1-8)" + sed -i -e "/^VERSION[[:space:]]*=/s:=.*:=${ver}:" Makefile + fi emake ${MAKE_ARGS} || die } @@ -88,6 +97,11 @@ src_install() { sed -i -e '/^unicode=/s:NO:YES:' "${D}"/etc/rc.conf fi + # Cater to the norm + if use x86 || use amd64; then + sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps + fi + # Fix portage bitching gen_usr_ldscript libeinfo.so gen_usr_ldscript librc.so @@ -98,12 +112,17 @@ pkg_preinst() { # so handle upgraders if ! has_version sys-apps/openrc; then local x= xtra= - use kernel_linux && xtra="${xtra} mtab procfs sysctl" - use kernel_FreeBSD && xtra="${xtra} dumpon savecore" + use kernel_linux && xtra="${xtra} hwclock mtab procfs sysctl" + use kernel_FreeBSD && xtra="${xtra} adjkerntz dumpon savecore" for x in fsck root swap ${xtra}; do [ -e "${ROOT}"etc/runlevels/boot/"${x}" ] && continue ln -snf /etc/init.d/"${x}" "${ROOT}"etc/runlevels/boot/"${x}" done + if [ -e "${ROOT}"etc/conf.d/clock ]; then + x=hwclock + use kernel_FreeBSD && x=adjkerntz + mv "${ROOT}"etc/conf.d/clock "${ROOT}"etc/conf.d/${x} + fi fi # Upgrade out state for baselayout-1 users @@ -130,6 +149,7 @@ pkg_postinst() { # Remove old baselayout links rm -f "${ROOT}"etc/runlevels/boot/checkfs \ "${ROOT}"etc/runlevels/boot/checkroot \ + "${ROOT}"etc/runlevels/boot/clock \ "${ROOT}"etc/runlevels/boot/rmnologin # Make our runlevels if they don't exist |