Browse Source

add modules.{order,builtin}

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6510 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 12 years ago
parent
commit
768ffe9703
1 changed files with 11 additions and 2 deletions
  1. 11 2
      k/kernel/kernel-vl.spec

+ 11 - 2
k/kernel/kernel-vl.spec

@@ -28,7 +28,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 %define patchlevel 4
 %define kversion 3.%{sublevel}
 %define rpmversion 3.%{sublevel}.%{patchlevel}
-%define release 1%{?_dist_release}
+%define release 2%{?_dist_release}
 
 %define make_target bzImage
 %define hdrarch %_target_cpu
@@ -777,6 +777,7 @@ BuildKernel() {
 
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer
     make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw=
+    cp modules.{order,builtin} $RPM_BUILD_ROOT/lib/modules/$KernelVer/
  
     # And save the headers/makefiles etc for building modules against
     #
@@ -857,7 +858,10 @@ BuildKernel() {
 		grep -v "^GPL v2" && exit 1 
     rm -f modinfo
     # remove files that will be auto generated by depmod at rpm -i time
-    rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.*
+    for i in alias alias.bin builtin.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap devname softdep
+    do
+          rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$i
+    done
 
     # Move the devel headers out of the root file system
     mkdir -p $RPM_BUILD_ROOT/usr/src/kernels
@@ -1123,6 +1127,7 @@ fi
 /boot/System.map-%{KVERREL}
 /boot/config-%{KVERREL}
 %dir /lib/modules/%{KVERREL}
+/lib/modules/%{KVERREL}/modules.*
 /lib/modules/%{KVERREL}/kernel
 /lib/modules/%{KVERREL}/build
 /lib/modules/%{KVERREL}/source
@@ -1139,6 +1144,7 @@ fi
 /boot/System.map-%{KVERREL}pae
 /boot/config-%{KVERREL}pae
 %dir /lib/modules/%{KVERREL}pae
+/lib/modules/%{KVERREL}pae/modules.*
 /lib/modules/%{KVERREL}pae/kernel
 /lib/modules/%{KVERREL}pae/build
 /lib/modules/%{KVERREL}pae/source
@@ -1170,6 +1176,9 @@ fi
 
 
 %changelog
+* Wed Jul 04 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.4.4-2
+- add modules.{order,builtin}
+
 * Sat Jun 23 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.4.4-1
 - update to 3.4.4