|
|
@@ -24,11 +24,11 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
|
|
|
# that the kernel isn't the stock distribution kernel, for example by
|
|
|
# adding some text to the end of the version number.
|
|
|
#
|
|
|
-%define sublevel 1
|
|
|
-%define patchlevel 0
|
|
|
-%define kversion 3.0.%{sublevel}
|
|
|
-%define rpmversion 3.0.%{sublevel}
|
|
|
-%define release 3%{?_dist_release}
|
|
|
+%define sublevel 0
|
|
|
+%define patchlevel 3
|
|
|
+%define kversion 3.%{sublevel}
|
|
|
+%define rpmversion 3.%{sublevel}.%{patchlevel}
|
|
|
+%define release 1%{?_dist_release}
|
|
|
|
|
|
%define make_target bzImage
|
|
|
%define hdrarch %_target_cpu
|
|
|
@@ -207,7 +207,7 @@ Source100: logo_vine_clut224.ppm
|
|
|
# Patches 0 through 100 are meant for core subsystem upgrades
|
|
|
#
|
|
|
%if %{patchlevel}
|
|
|
-Patch1: patch-%{version}.%{patchlevel}.bz2
|
|
|
+Patch1: patch-%{kversion}.%{patchlevel}.bz2
|
|
|
%endif
|
|
|
|
|
|
# Patches 100 through 500 are meant for architecture patches
|
|
|
@@ -252,7 +252,6 @@ Patch1840: linux-2.6-defaults-pci_no_msi.patch
|
|
|
Patch1850: linux-2.6-silence-fbcon-logo.patch
|
|
|
Patch1860: linux-2.6-silence-acpi-blacklist.patch
|
|
|
Patch1870: linux-2.6.35-input-mouse-alps-dell-e6510.patch
|
|
|
-Patch1880: linux-2.6.35-sdhci-enable-ricoh-mmc.patch
|
|
|
Patch1890: linux-2.6.35-mmc-sdhci-update.patch
|
|
|
Patch1900: linux-2.6.35-quirk-lenovo-itpm.patch
|
|
|
|
|
|
@@ -487,7 +486,7 @@ against the PAE capable kernel package.
|
|
|
|
|
|
%prep
|
|
|
|
|
|
-%setup -q -n %{name}-%{kversion} -c
|
|
|
+%setup -q -n %{name}-%{version} -c
|
|
|
cd linux-%{kversion}
|
|
|
|
|
|
#
|
|
|
@@ -672,6 +671,7 @@ for i in *.config
|
|
|
do
|
|
|
mv $i .config
|
|
|
Arch=`head -1 .config | cut -b 3-`
|
|
|
+ make ARCH=$Arch oldnoconfig
|
|
|
echo "# $Arch" > configs/$i
|
|
|
cat .config >> configs/$i
|
|
|
done
|
|
|
@@ -679,7 +679,7 @@ done
|
|
|
# make sure the kernel has the sublevel we know it has. This looks weird
|
|
|
# but for -pre and -rc versions we need it since we only want to use
|
|
|
# the higher version when the final kernel is released.
|
|
|
-perl -p -i -e "s/^SUBLEVEL.*/SUBLEVEL = %{sublevel}/" Makefile
|
|
|
+perl -p -i -e "s/^SUBLEVEL.*/SUBLEVEL = %{patchlevel}/" Makefile
|
|
|
perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -prep/" Makefile
|
|
|
|
|
|
# get rid of unwanted files resulting from patch fuzz
|
|
|
@@ -723,6 +723,16 @@ BuildKernel() {
|
|
|
Arch=`head -1 .config | cut -b 3-`
|
|
|
echo USING ARCH=$Arch
|
|
|
|
|
|
+ echo CHECKING NEW CONFIG OPTIONS...
|
|
|
+ make ARCH=$Arch listnewconfig | grep -E '^CONFIG_' > .newoptions || true
|
|
|
+ if [ -s .newoptions ]; then
|
|
|
+ echo NEW CONFIG OPTION FOUND.
|
|
|
+ cat .newoptions
|
|
|
+ else
|
|
|
+ echo NO NEW CONFIG OPTION FOUND.
|
|
|
+ fi
|
|
|
+ rm -f .newoptions
|
|
|
+
|
|
|
##VINE## make -s ARCH=$Arch nonint_oldconfig > /dev/null
|
|
|
make -s ARCH=$Arch oldnoconfig > /dev/null
|
|
|
make -s ARCH=$Arch include/linux/version.h
|
|
|
@@ -1140,6 +1150,12 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Aug 19 2011 Daisuke SUZUKI <daisuke@linux.or.jp> - 3.0.3-1
|
|
|
+- update to 3.0.3
|
|
|
+- udpate configs
|
|
|
+ - build legacy IDE drivers as module
|
|
|
+ - enable new drivers
|
|
|
+
|
|
|
* Mon Aug 15 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 3.0.1-3
|
|
|
- add Patch9010 to fix build failure on ppc
|
|
|
|
daisuke