Attachment 314994 Details for Bug 460137 – patch v2

[patch] patch v2

configs.patch (text/plain), 1.85 KB, created by Prarit Bhargava on 2008-08-26 13:07:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2008-08-26 13:07:54 UTC

Size: 1.85 KB

patch

obsolete

>--- a/redhat/Makefile
>+++ b/redhat/Makefile
>@@ -14,6 +14,12 @@ TESTPATCH:=$(srctree)/redhat/linux-kernel-test.patch
> rh-configs:
> 	cd ./redhat/configs; make configs
> 
>+rh-configs-rhel:
>+	cd ./redhat/configs; make configs-rhel
>+
>+rh-configs-prep:
>+	cd ./redhat/configs; make configs-prep
>+
> rh-clean-configs:
> 	cd ./redhat/configs; make clean-config
> 
>diff --git a/redhat/configs/Makefile b/redhat/configs/Makefile
>index 55f6f99..f671eb5 100644
>--- a/redhat/configs/Makefile
>+++ b/redhat/configs/Makefile
>@@ -4,6 +4,7 @@
> 
> VERSION		= 2.6.9
> CFG		= kernel-$(VERSION)
>+CFG_DIR		= ../../configs
> 
> CONFIGFILES	= \
> 	$(CFG)-i686.config $(CFG)-i686-smp.config \
>@@ -21,10 +22,36 @@ TEMPFILES	= $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
> 
> configs: $(CONFIGFILES)
> 
>+# Disable the RHEL specific options we don't support
>+configs-rhel: configs config-rhel-generic
>+	@mkdir -p $(CFG_DIR)
>+	@for i in $(CONFIGFILES); do \
>+		perl merge.pl config-rhel-generic $$i > $(CFG_DIR)/$$i ; \
>+	done
>+	@for i in $(CFG)-ppc64.config; do \
>+		perl merge.pl config-ppc64-generic $$i > $(CFG_DIR)/$$i ; \
>+	done
>+	@#remove the arches we don't care about
>+	@for i in $(DROP); do \
>+		rm -f $(CFG_DIR)/$$i ; \
>+	done
>+
> # Augment the clean target to clean up our own cruft
> clean-config ::
> 	@rm -fv $(CONFIGFILES) $(TEMPFILES) temp-generic kernel-$(VERSION)*config
> 
>+configs-prep: configs-rhel
>+	@cd ../.. && \
>+	for i in configs/*.config; do \
>+		mv $$i .config ; \
>+		Arch=$$(echo $$i | cut -d"-" -f3 | cut -d"." -f1 | sed -e s/i.86/i386/ -e s/s390x/s390/ -e s/ppc64.series/ppc64/) ; \
>+		echo "Configuring $$i" ; \
>+		make  ARCH=$$Arch nonint_oldconfig > /dev/null || exit 1; \
>+		echo "# $$Arch" > $$i; \
>+		cat .config >> $$i; \
>+	done
>+
>+
> temp-generic: config-generic config-rhel-generic Makefile
> 	cp config-generic temp-generic
> 	perl merge.pl config-rhel-generic config-generic > temp-generic

Actions: View | Diff

Attachments on bug 460137: 314993 | 314994