rpms/kernel/devel Makefile,1.114,1.115
Dave Jones
davej at fedoraproject.org
Wed Oct 14 00:12:14 UTC 2009
Author: davej
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2013/devel
Modified Files:
Makefile
Log Message:
Fix up 'make reconfig'.
devel is still borked, but this change will at least make it work after F13
is branched. It needs some smarts to use the 'next' version number when
we're in -rc stage.
Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- Makefile 11 Oct 2009 07:29:06 -0000 1.114
+++ Makefile 14 Oct 2009 00:12:13 -0000 1.115
@@ -32,6 +32,12 @@ endif
include $(MAKEFILE_COMMON)
include Makefile.config
+ifndef KVERSION
+KVERSION := $(shell awk '$$1 == "%define" && $$2 == "base_sublevel" { \
+ print "2.6." $$3 \
+ }' $(SPECFILE))
+endif
+
extremedebug:
@perl -pi -e 's/# CONFIG_DEBUG_PAGEALLOC is not set/CONFIG_DEBUG_PAGEALLOC=y/' config-nodebug
@@ -145,7 +151,7 @@ rhel:
reconfig:
@rm -f kernel-*-config
- @VERSION="2.6.30" make -f Makefile.config configs
+ @VERSION=$(KVERSION) make -f Makefile.config configs
@scripts/reconfig.sh
force-tag: $(SPECFILE) $(COMMON_DIR)/branches
@@ -188,12 +194,6 @@ srpm beehive-sprm: RELEASE := 0.$(varian
endif
endif
-ifndef KVERSION
-KVERSION := $(shell awk '$$1 == "%define" && $$2 == "base_sublevel" { \
- print "2.6." $$3 \
- }' $(SPECFILE))
-endif
-
#
# Hacks for building kernel rpms from upstream code plus local GIT branches.
# Use "make git/BRANCH/TARGET" like "make TARGET".
More information about the fedora-extras-commits
mailing list