rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

Merge fixup

Browse Source
This commit is contained in:
Justin M. Forbes 2012-04-02 15:45:30 -05:00
commit 3be53ac526
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -1,11 +1,6 @@
# Makefile for source rpm: kernel # Makefile for source rpm: kernel
SPECFILE := kernel.spec SPECFILE := kernel.spec
# use noarch for make prep instead of the current CPU
# noarch creates and checks all config files not just the current one,
# in addition "i386" isn't a valid kernel target
PREPARCH = noarch
# we only check the .sign signatures # we only check the .sign signatures
UPSTREAM_CHECKS = sign UPSTREAM_CHECKS = sign
@ -18,7 +13,7 @@ help:
include Makefile.config include Makefile.config
prep: prep:
fedpkg -v prep --arch=$(PREPARCH) fedpkg -v prep
noarch: noarch:
fedpkg -v local --arch=noarch fedpkg -v local --arch=noarch

5
kernel.spec
View File

@ -1458,7 +1458,7 @@ rm -f kernel-%{version}-*debug.config
%endif %endif
# now run oldconfig over all the config files # now run oldconfig over all the config files
for i in kernel-*-$(uname -p)*.config for i in kernel-*-%{_target_cpu}*.config
do do
mv $i .config mv $i .config
Arch=`head -1 .config | cut -b 3-` Arch=`head -1 .config | cut -b 3-`
@ -2289,6 +2289,9 @@ fi
* Fri Mar 30 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc0.git5.1 * Fri Mar 30 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc0.git5.1
- Linux v3.3-9295-gf52b69f - Linux v3.3-9295-gf52b69f
* Fri Mar 30 2012 Dave Jones <davej@redhat.com>
- Change config parsing to use {_target_cpu} (From Niels de Vos)
* Thu Mar 29 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc0.git4.1 * Thu Mar 29 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc0.git4.1
- Linux v3.3-8839-gb5174fa - Linux v3.3-8839-gb5174fa