[gentoo-commits] gentoo-x86 commit in sys-apps/kmod: kmod-9999.ebuild kmod-18-r1.ebuild kmod-16.ebuild kmod-17.ebuild kmod-18.ebuild ChangeLog

[Richard Yao (ryao)]

ryao        14/08/29 18:35:57

  Modified:             kmod-9999.ebuild kmod-18-r1.ebuild kmod-16.ebuild
                        kmod-17.ebuild kmod-18.ebuild ChangeLog
  Log:
  Use ${EROOT} instead of / or ${ROOT}. This lets things build on Gentoo Prefix and should allow cross compilation with Catalyst. WilliamH gave his okay in IRC for the non-maintainer commit.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)

Revision  Changes    Path
1.80                 sys-apps/kmod/kmod-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?r1=1.79&r2=1.80

Index: kmod-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kmod-9999.ebuild	11 Jul 2014 12:28:07 -0000	1.79
+++ kmod-9999.ebuild	29 Aug 2014 18:35:57 -0000	1.80
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.79 2014/07/11 12:28:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.80 2014/08/29 18:35:57 ryao Exp $
 
 EAPI=5
 
@@ -74,8 +74,8 @@
 
 src_configure() {
 	local myeconfargs=(
-		--bindir=/bin
-		--with-rootlibdir="/$(get_libdir)"
+		--bindir="${EROOT}bin"
+		--with-rootlibdir="${EROOT}$(get_libdir)"
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable tools)
@@ -168,23 +168,23 @@
 }
 
 pkg_postinst() {
-	if [[ -L ${ROOT%/}/etc/runlevels/boot/static-nodes ]]; then
+	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
 		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${ROOT%/}"/etc/runlevels/boot/static-nodes
+		rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
 	fi
 
 	# Add kmod to the runlevel automatically if this is the first install of this package.
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${ROOT%/}"/etc/runlevels/sysinit
+		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
 		fi
-		if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${ROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
+		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
 		fi
 	fi
 
-	if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
+		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
 			ewarn
 			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
 			ewarn "kernel modules to have required static nodes!"



1.8                  sys-apps/kmod/kmod-18-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-18-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-18-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-18-r1.ebuild?r1=1.7&r2=1.8

Index: kmod-18-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-18-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kmod-18-r1.ebuild	22 Jul 2014 09:24:44 -0000	1.7
+++ kmod-18-r1.ebuild	29 Aug 2014 18:35:57 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-18-r1.ebuild,v 1.7 2014/07/22 09:24:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-18-r1.ebuild,v 1.8 2014/08/29 18:35:57 ryao Exp $
 
 EAPI=5
 
@@ -74,8 +74,8 @@
 
 src_configure() {
 	local myeconfargs=(
-		--bindir=/bin
-		--with-rootlibdir="/$(get_libdir)"
+		--bindir="${EROOT}bin"
+		--with-rootlibdir="${EROOT}$(get_libdir)"
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable tools)
@@ -168,23 +168,23 @@
 }
 
 pkg_postinst() {
-	if [[ -L ${ROOT%/}/etc/runlevels/boot/static-nodes ]]; then
+	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
 		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${ROOT%/}"/etc/runlevels/boot/static-nodes
+		rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
 	fi
 
 	# Add kmod to the runlevel automatically if this is the first install of this package.
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${ROOT%/}"/etc/runlevels/sysinit
+		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
 		fi
-		if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${ROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
+		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
 		fi
 	fi
 
-	if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
+		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
 			ewarn
 			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
 			ewarn "kernel modules to have required static nodes!"



1.16                 sys-apps/kmod/kmod-16.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-16.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-16.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-16.ebuild?r1=1.15&r2=1.16

Index: kmod-16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-16.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kmod-16.ebuild	14 May 2014 21:30:38 -0000	1.15
+++ kmod-16.ebuild	29 Aug 2014 18:35:57 -0000	1.16
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-16.ebuild,v 1.15 2014/05/14 21:30:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-16.ebuild,v 1.16 2014/08/29 18:35:57 ryao Exp $
 
 EAPI=5
 inherit bash-completion-r1 eutils multilib
@@ -59,8 +59,8 @@
 
 src_configure() {
 	econf \
-		--bindir=/bin \
-		--with-rootlibdir="/$(get_libdir)" \
+		--bindir="${EROOT}bin" \
+		--with-rootlibdir="${EROOT}$(get_libdir)" \
 		--enable-shared \
 		$(use_enable static-libs static) \
 		$(use_enable tools) \
@@ -109,23 +109,23 @@
 }
 
 pkg_postinst() {
-	if [[ -L ${ROOT%/}/etc/runlevels/boot/static-nodes ]]; then
+	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
 		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${ROOT%/}"/etc/runlevels/boot/static-nodes
+		rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
 	fi
 
 	# Add kmod to the runlevel automatically if this is the first install of this package.
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${ROOT%/}"/etc/runlevels/sysinit
+		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
 		fi
-		if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${ROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
+		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
 		fi
 	fi
 
-	if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
+		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
 			ewarn
 			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
 			ewarn "kernel modules to have required static nodes!"



1.12                 sys-apps/kmod/kmod-17.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-17.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-17.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-17.ebuild?r1=1.11&r2=1.12

Index: kmod-17.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-17.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kmod-17.ebuild	6 Jun 2014 16:11:47 -0000	1.11
+++ kmod-17.ebuild	29 Aug 2014 18:35:57 -0000	1.12
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-17.ebuild,v 1.11 2014/06/06 16:11:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-17.ebuild,v 1.12 2014/08/29 18:35:57 ryao Exp $
 
 EAPI=5
 
@@ -74,8 +74,8 @@
 
 src_configure() {
 	local myeconfargs=(
-		--bindir=/bin
-		--with-rootlibdir="/$(get_libdir)"
+		--bindir="${EROOT}bin"
+		--with-rootlibdir="${EROOT}$(get_libdir)"
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable tools)
@@ -168,23 +168,23 @@
 }
 
 pkg_postinst() {
-	if [[ -L ${ROOT%/}/etc/runlevels/boot/static-nodes ]]; then
+	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
 		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${ROOT%/}"/etc/runlevels/boot/static-nodes
+		rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
 	fi
 
 	# Add kmod to the runlevel automatically if this is the first install of this package.
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${ROOT%/}"/etc/runlevels/sysinit
+		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
 		fi
-		if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${ROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
+		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
 		fi
 	fi
 
-	if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
+		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
 			ewarn
 			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
 			ewarn "kernel modules to have required static nodes!"



1.2                  sys-apps/kmod/kmod-18.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-18.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-18.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-18.ebuild?r1=1.1&r2=1.2

Index: kmod-18.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-18.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kmod-18.ebuild	22 Jun 2014 08:01:45 -0000	1.1
+++ kmod-18.ebuild	29 Aug 2014 18:35:57 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-18.ebuild,v 1.1 2014/06/22 08:01:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-18.ebuild,v 1.2 2014/08/29 18:35:57 ryao Exp $
 
 EAPI=5
 
@@ -74,8 +74,8 @@
 
 src_configure() {
 	local myeconfargs=(
-		--bindir=/bin
-		--with-rootlibdir="/$(get_libdir)"
+		--bindir="${EROOT}bin"
+		--with-rootlibdir="${EROOT}$(get_libdir)"
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable tools)
@@ -168,23 +168,23 @@
 }
 
 pkg_postinst() {
-	if [[ -L ${ROOT%/}/etc/runlevels/boot/static-nodes ]]; then
+	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
 		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${ROOT%/}"/etc/runlevels/boot/static-nodes
+		rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
 	fi
 
 	# Add kmod to the runlevel automatically if this is the first install of this package.
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${ROOT%/}"/etc/runlevels/sysinit
+		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
 		fi
-		if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${ROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
+		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
 		fi
 	fi
 
-	if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
+		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
 			ewarn
 			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
 			ewarn "kernel modules to have required static nodes!"



1.166                sys-apps/kmod/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.166&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.166&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?r1=1.165&r2=1.166

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- ChangeLog	22 Jul 2014 09:24:44 -0000	1.165
+++ ChangeLog	29 Aug 2014 18:35:57 -0000	1.166
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.165 2014/07/22 09:24:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.166 2014/08/29 18:35:57 ryao Exp $
+
+  29 Aug 2014; Richard Yao <ryao@g.o> kmod-16.ebuild, kmod-17.ebuild,
+  kmod-18-r1.ebuild, kmod-18.ebuild, kmod-9999.ebuild:
+  Use ${EROOT} instead of / or ${ROOT}. This lets things build on Gentoo Prefix
+  and should allow cross compilation with Catalyst. WilliamH gave his okay in
+  IRC for the non-maintainer commit.
 
   22 Jul 2014; Tobias Klausmann <klausman@g.o> kmod-18-r1.ebuild:
   Stable on alpha, bug #517106