Author: fs
Date: Sat Jan 28 13:35:23 2006
New Revision: 5615
Modified:
dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
dists/sid/linux-2.6/debian/rules.real
Log:
New option for arch/$arch/defines: if setting initrd=no, make-kpkg will be
called without --initrd.
Modified: dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
(original)
+++ dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Sat Jan
28 13:35:23 2006
@@ -178,6 +178,7 @@
for i in (
('compiler', 'COMPILER'),
('kernel-arch', 'KERNEL_ARCH')
+ ('initrd', 'INITRD')
):
if config_entry.has_key(i[0]):
makeflags[i[1]] = config_entry[i[0]]
Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real (original)
+++ dists/sid/linux-2.6/debian/rules.real Sat Jan 28 13:35:23 2006
@@ -43,7 +43,9 @@
kpkg_image := make-kpkg --append-to-version '$(KPKG_ABINAME)$(LOCALVERSION)'
kpkg_image += --arch '$(ARCH)'
kpkg_image += --stem linux
-kpkg_image += --initrd
+ifneq ($(INITRD),no)
+ kpkg_image += --initrd
+endif
ifdef KPKG_SUBARCH
kpkg_image += --subarch '$(KPKG_SUBARCH)'
kpkg_header += --subarch '$(KPKG_SUBARCH)'
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
