diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2003-04-28 20:56:17 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2003-04-28 20:56:17 +0000 |
| commit | 4d62f0c3ee83bd08c13397f05ef10dbd0d1979c8 (patch) | |
| tree | e9f416c8de72868d26eab4eb56df10f7908f79e6 /sys-apps | |
| parent | Initial import. (diff) | |
| download | gentoo-2-4d62f0c3ee83bd08c13397f05ef10dbd0d1979c8.tar.gz gentoo-2-4d62f0c3ee83bd08c13397f05ef10dbd0d1979c8.tar.bz2 gentoo-2-4d62f0c3ee83bd08c13397f05ef10dbd0d1979c8.zip | |
fix MAKEDEV problems in bug #15299
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-apps/baselayout/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.8.6.6.ebuild | 33 |
3 files changed, 28 insertions, 19 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 61aa00f13d4c..fd00fce51dbd 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-apps/baselayout # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.75 2003/04/28 18:43:54 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.76 2003/04/28 20:56:17 azarah Exp $ + + 28 Apr 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.6.ebuild : + Some of the build images have MAKEDEV in /usr/sbin, and we called it with + /usr/sbin/MAKEDEV, which is wrong since we moved it to /sbin. This caused + things to break, as we called /usr/sbin/MAKEDEV, and subsequent calls used + the copy in /sbin, which is different versions. Add a symlink in /usr/sbin + to overwrite the invalide MAKEDEV, and call it via /sbin/MAKEDEV. This + should close bug #15299. 28 Apr 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.6.ebuild : Fix docs installing to the wrong place (bug #20091), thanks to sharp eye of diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 8f4411c8e7b4..c40b92f5ab60 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,7 +1,7 @@ -MD5 edbd2c6010721441ab92672299964d57 ChangeLog 14158 +MD5 94520f911c32216415e68a27d11ce34a ChangeLog 14648 MD5 2b07c2619db3241a60197769cd2d99e0 baselayout-1.8.5.9.ebuild 15843 MD5 41752745c674aec9b15d556f9a3a9d42 baselayout-1.8.6.5.ebuild 18884 -MD5 e576256a97e098991abf8304e7033346 baselayout-1.8.6.6.ebuild 18896 +MD5 dfbad68000f8074a7447723251e65b2d baselayout-1.8.6.6.ebuild 18880 MD5 22cacb1440a77ed686fa6ff4ae9a1191 baselayout-1.8.5.8.ebuild 15844 MD5 520c7779777130658aa2c770de34ab4b files/MAKEDEV.8 9397 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 diff --git a/sys-apps/baselayout/baselayout-1.8.6.6.ebuild b/sys-apps/baselayout/baselayout-1.8.6.6.ebuild index 35733b3e491d..272982e4a8bc 100644 --- a/sys-apps/baselayout/baselayout-1.8.6.6.ebuild +++ b/sys-apps/baselayout/baselayout-1.8.6.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.6.ebuild,v 1.2 2003/04/28 18:43:54 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.6.ebuild,v 1.3 2003/04/28 20:56:17 azarah Exp $ # This ebuild needs to be merged "live". You can't simply make a package # of it and merge it later. @@ -233,6 +233,7 @@ src_install() { into / dosbin ${S}/sbin/MAKEDEV + dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV keepdir /lib/dev-state if [ "${altmerge}" -eq "1" ] then @@ -469,42 +470,42 @@ pkg_postinst() { case ${ARCH} in x86) einfo "Using generic-i386 to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-i386 + ${ROOT}/sbin/MAKEDEV generic-i386 ;; ppc) einfo "Using generic-powerpc to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-powerpc + ${ROOT}/sbin/MAKEDEV generic-powerpc ;; sparc) einfo "Using generic-sparc to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-sparc + ${ROOT}/sbin/MAKEDEV generic-sparc ;; mips) einfo "Using generic-mips to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-mips + ${ROOT}/sbin/MAKEDEV generic-mips ;; arm) einfo "Using generic-arm to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-arm + ${ROOT}/sbin/MAKEDEV generic-arm ;; hppa) einfo "Using generic-hppa to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic-hppa + ${ROOT}/sbin/MAKEDEV generic-hppa ;; *) einfo "Using generic to make device nodes..." - ${ROOT}/usr/sbin/MAKEDEV generic + ${ROOT}/sbin/MAKEDEV generic ;; esac - ${ROOT}/usr/sbin/MAKEDEV sg - ${ROOT}/usr/sbin/MAKEDEV scd - ${ROOT}/usr/sbin/MAKEDEV rtc - ${ROOT}/usr/sbin/MAKEDEV audio - ${ROOT}/usr/sbin/MAKEDEV hde - ${ROOT}/usr/sbin/MAKEDEV hdf - ${ROOT}/usr/sbin/MAKEDEV hdg - ${ROOT}/usr/sbin/MAKEDEV hdh + ${ROOT}/sbin/MAKEDEV sg + ${ROOT}/sbin/MAKEDEV scd + ${ROOT}/sbin/MAKEDEV rtc + ${ROOT}/sbin/MAKEDEV audio + ${ROOT}/sbin/MAKEDEV hde + ${ROOT}/sbin/MAKEDEV hdf + ${ROOT}/sbin/MAKEDEV hdg + ${ROOT}/sbin/MAKEDEV hdh fi # We create the /boot directory here so that /boot doesn't get deleted when a previous # baselayout is unmerged with /boot unmounted. |