kernel-$VERSION == $CFG

... and it's used above, so... use it.
This commit is contained in:
Kyle McMartin 2013-06-10 12:35:14 -04:00
parent 5847c39b97
commit 82b54fdc46

View File

@ -73,44 +73,44 @@ temp-powerpc64-generic: config-powerpc64 temp-powerpc-generic
temp-s390-generic: config-s390x temp-generic temp-s390-generic: config-s390x temp-generic
perl merge.pl $^ > $@ perl merge.pl $^ > $@
kernel-$(VERSION)-i686-PAE.config: config-i686-PAE temp-x86-32-generic $(CFG)-i686-PAE.config: config-i686-PAE temp-x86-32-generic
perl merge.pl $^ i386 > $@ perl merge.pl $^ i386 > $@
kernel-$(VERSION)-i686-PAEdebug.config: config-i686-PAE temp-x86-debug-generic $(CFG)-i686-PAEdebug.config: config-i686-PAE temp-x86-debug-generic
perl merge.pl $^ i386 > $@ perl merge.pl $^ i386 > $@
kernel-$(VERSION)-i686.config: /dev/null temp-x86-32-generic $(CFG)-i686.config: /dev/null temp-x86-32-generic
perl merge.pl $^ i386 > $@ perl merge.pl $^ i386 > $@
kernel-$(VERSION)-i686-debug.config: /dev/null temp-x86-debug-generic $(CFG)-i686-debug.config: /dev/null temp-x86-debug-generic
perl merge.pl $^ i386 > $@ perl merge.pl $^ i386 > $@
kernel-$(VERSION)-x86_64.config: /dev/null temp-x86_64-generic $(CFG)-x86_64.config: /dev/null temp-x86_64-generic
perl merge.pl $^ x86_64 > $@ perl merge.pl $^ x86_64 > $@
kernel-$(VERSION)-x86_64-debug.config: /dev/null temp-x86_64-debug-generic $(CFG)-x86_64-debug.config: /dev/null temp-x86_64-debug-generic
perl merge.pl $^ x86_64 > $@ perl merge.pl $^ x86_64 > $@
kernel-$(VERSION)-ppc64.config: /dev/null temp-powerpc64-generic $(CFG)-ppc64.config: /dev/null temp-powerpc64-generic
perl merge.pl $^ powerpc > $@ perl merge.pl $^ powerpc > $@
kernel-$(VERSION)-ppc64-debug.config: temp-powerpc64-generic temp-powerpc-debug-generic $(CFG)-ppc64-debug.config: temp-powerpc64-generic temp-powerpc-debug-generic
perl merge.pl $^ powerpc > $@ perl merge.pl $^ powerpc > $@
kernel-$(VERSION)-ppc64p7.config: config-powerpc64p7 temp-powerpc64-generic $(CFG)-ppc64p7.config: config-powerpc64p7 temp-powerpc64-generic
perl merge.pl $^ powerpc > $@ perl merge.pl $^ powerpc > $@
kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic $(CFG)-s390x.config: config-s390x temp-s390-generic
perl merge.pl $^ s390 > $@ perl merge.pl $^ s390 > $@
kernel-$(VERSION)-armv7hl.config: /dev/null temp-armv7 $(CFG)-armv7hl.config: /dev/null temp-armv7
perl merge.pl $^ arm > $@ perl merge.pl $^ arm > $@
kernel-$(VERSION)-armv7hl-lpae.config: /dev/null temp-armv7-lpae $(CFG)-armv7hl-lpae.config: /dev/null temp-armv7-lpae
perl merge.pl $^ arm > $@ perl merge.pl $^ arm > $@
kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic $(CFG)-ppc.config: /dev/null temp-powerpc32-generic
perl merge.pl $^ powerpc > $@ perl merge.pl $^ powerpc > $@
kernel-$(VERSION)-ppc-smp.config: config-powerpc32-smp temp-powerpc32-generic $(CFG)-ppc-smp.config: config-powerpc32-smp temp-powerpc32-generic
perl merge.pl $^ powerpc > $@ perl merge.pl $^ powerpc > $@