|
|
@@ -34,7 +34,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
|
|
|
%define patchlevel 7
|
|
|
%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
|
|
|
@@ -296,8 +296,7 @@ Patch2710: linux-2.6-drm-ignore-invalid-EDID-extensions.patch
|
|
|
#
|
|
|
|
|
|
# aufs3
|
|
|
-#Patch6100: linux-3.6-aufs3.patch
|
|
|
-%define aufs_date 20130212
|
|
|
+%define aufs_date 20130213
|
|
|
Patch6100: aufs3.7-%{aufs_date}.patch
|
|
|
Source6100: aufs3.7-%{aufs_date}.tar.xz
|
|
|
|
|
|
@@ -641,6 +640,7 @@ cd linux-%{kversion}
|
|
|
# aufs
|
|
|
%__tar xf %{SOURCE6100}
|
|
|
%patch6100 -p1 -b .aufs3
|
|
|
+echo "header-y += aufs_type.h" >> include/uapi/linux/Kbuild
|
|
|
|
|
|
# tuxonice
|
|
|
%patch9000 -p1
|
|
|
@@ -781,6 +781,9 @@ BuildKernel() {
|
|
|
rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/source
|
|
|
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
|
|
|
(cd $RPM_BUILD_ROOT/lib/modules/$KernelVer ; ln -s build source)
|
|
|
+ # dirs for additional modules per module-init-tools, kbuild/modules.txt
|
|
|
+ mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra
|
|
|
+ mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates
|
|
|
# first copy everything
|
|
|
cp --parents `find -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
|
|
|
cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
|
|
|
@@ -811,7 +814,8 @@ BuildKernel() {
|
|
|
|
|
|
# Make sure the Makefile and version.h have a matching timestamp so that
|
|
|
# external modules can be built
|
|
|
- touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/version.h
|
|
|
+ touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile \
|
|
|
+ $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/generated/uapi/linux/version.h
|
|
|
touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/autoconf.h
|
|
|
# Copy .config to include/config/auto.conf so "make prepare" is unnecessary.
|
|
|
cp $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/config/auto.conf
|
|
|
@@ -1167,6 +1171,9 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Feb 13 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 3.7.7-2
|
|
|
+- update aufs patch to fix kernel-headers
|
|
|
+
|
|
|
* Tue Feb 12 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 3.7.7-1
|
|
|
- update to 3.7.7
|
|
|
- update tuxonice and aufs patch
|
daisuke