rpms/akmods/devel akmods, 1.8, 1.9 akmods.spec, 1.10, 1.11 akmodsbuild, 1.1, 1.2

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/akmods/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22478/devel

Modified Files:
	akmods akmods.spec akmodsbuild 
Log Message:
Update to UsrMove



Index: akmods
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmods,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- akmods	24 Nov 2011 16:59:46 -0000	1.8
+++ akmods	7 Feb 2012 12:52:51 -0000	1.9
@@ -304,17 +304,17 @@
 	local this_kmodname=${2}
 
 	# kmod present?
-	if [[ ! -d /lib/modules/${this_kernelver}/extra/${this_kmodname}/ ]] ; then
+	if [[ ! -d /usr/lib/modules/${this_kernelver}/extra/${this_kmodname}/ ]] ; then
 		# build it
 		return 1
 	fi
 
 	# kmod up2date? 
-	local kmodpackage="$(rpm -qf /lib/modules/${this_kernelver}/extra/${this_kmodname}/ 2> /dev/null)"
+	local kmodpackage="$(rpm -qf /usr/lib/modules/${this_kernelver}/extra/${this_kmodname}/ 2> /dev/null)"
 	if [[ ! "${kmodpackage}" ]]; then
 		# seems we didn't get what we wanted
 		# well, better to do nothing in this case
-		akmods_echo 1 2 -n "Warning: Could not determine what package owns /lib/modules/${this_kernelver}/extra/${this_kmodname}/"
+		akmods_echo 1 2 -n "Warning: Could not determine what package owns /usr/lib/modules/${this_kernelver}/extra/${this_kmodname}/"
 		return 0
 	fi
 	local kmodver=$(rpm -q --qf '%{EPOCH}:%{VERSION}-%{RELEASE}\n' "${kmodpackage}" | sed 's|(none)|0|; s!\.\(fc\|lvn\)[0-9]*!!g')
@@ -364,12 +364,12 @@
 				akmods_echo 1 2 --success 
 				# if the files for building modules are not avilable don't even try to build modules
 				if [[ ! -r /usr/src/kernels/"${this_kernelver}"/Makefile ]] && \
-				   [[ ! -r /lib/modules/${this_kernelver}/build/Makefile ]]; then
+				   [[ ! -r /usr/lib/modules/${this_kernelver}/build/Makefile ]]; then
 					akmods_echo 1 2 "Files needed for building modules against kernel"
 					akmods_echo 1 2 "${this_kernelver} could not be found as the following" 
 					akmods_echo 1 2 "directories are missing:" 
 					akmods_echo 1 2 "/usr/src/kernels/${this_kernelver}/" 
-					akmods_echo 1 2 -n "/lib/modules/${this_kernelver}/build/" 
+					akmods_echo 1 2 -n "/usr/lib/modules/${this_kernelver}/build/" 
 					akmods_echo 1 2 -n "Is the correct kernel-devel package installed?"
 					akmods_echo 1 2 --failure
 					return 1
@@ -425,7 +425,7 @@
 				echo "ERROR: Please provide the kernel-version to build for together with --kernel" >&2
 				exit 1
 			elif [[ ! -r /usr/src/kernels/"${1}"/Makefile ]] && \
-			     [[ ! -r /lib/modules/${1}/build/Makefile ]]; then
+			     [[ ! -r /usr/lib/modules/${1}/build/Makefile ]]; then
 				echo "Could not find files needed to compile modules for ${1}"
 				exit 1
 			elif [[ -r /usr/src/kernels/"${1}"/Makefile ]] && \


Index: akmods.spec
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmods.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- akmods.spec	24 Nov 2011 16:59:46 -0000	1.10
+++ akmods.spec	7 Feb 2012 12:52:51 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           akmods
 Version:        0.3.8
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        Automatic kmods build and install tool 
 
 Group:          System Environment/Kernel
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Wed Feb 01 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.3.8-3.1
+- AkmodUsrMove
+
 * Tue Nov 24 2011 Richard Shaw <hobbes1069 at gmail.com> - 0.3.8-3
 - Kmod can be newer than akmod due to rebuilds for new kernels (#2063)
 


Index: akmodsbuild
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmodsbuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- akmodsbuild	2 Oct 2008 17:28:11 -0000	1.1
+++ akmodsbuild	7 Feb 2012 12:52:51 -0000	1.2
@@ -44,12 +44,12 @@
 
 	# do we have everything we need to build for the kernels in question?
 	for kernel in ${kernels}; do
-		if [[ ! -e /usr/src/kernels/${kernel}/Makefile ]] && [[ ! -e /lib/modules/${kernel}/build/Makefile ]]; then
+		if [[ ! -e /usr/src/kernels/${kernel}/Makefile ]] && [[ ! -e /usr/lib/modules/${kernel}/build/Makefile ]]; then
 			echo "ERROR: Files needed for building modules against kernel" >&2
 			echo " ${kernel} could not be found as the following" >&2
 			echo " directories are missing:"
 			echo " /usr/src/kernels/${kernel}/" >&2
-			echo " /lib/modules/${kernel}/build/" >&2
+			echo " /usr/lib/modules/${kernel}/build/" >&2
 			exit 2
 		fi
 	done