* debian/arch/powerpc/defines: Set kernel-header-dirs.
* debian/bin/gencontrol.py: Export kernel-header-dirs as KERNEL_HEADER_DIRS. * debian/bin/install-header: - Move from debian/templates/header-install.in. - Use KERNEL_HEADER_DIRS. * debian/rules.real: Use debian/bin/install-header. svn path=/dists/trunk/linux-2.6/; revision=4606
This commit is contained in:
parent
d529edbcfc
commit
4d89e2fa76
|
@ -5,6 +5,7 @@ flavours:
|
||||||
powerpc-miboot
|
powerpc-miboot
|
||||||
powerpc64
|
powerpc64
|
||||||
kernel-arch: ppc
|
kernel-arch: ppc
|
||||||
|
kernel-header-dirs: powerpc ppc ppc64 m68k
|
||||||
kpkg-subarch: powerpc
|
kpkg-subarch: powerpc
|
||||||
|
|
||||||
[apus]
|
[apus]
|
||||||
|
|
|
@ -331,7 +331,7 @@ def process_real_flavour(packages, makefile, config, arch, subarch, flavour, var
|
||||||
makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour), None))
|
makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour), None))
|
||||||
|
|
||||||
makeflags['FLAVOUR'] = flavour
|
makeflags['FLAVOUR'] = flavour
|
||||||
for i in (('compiler', 'COMPILER'), ('kpkg-subarch', 'KPKG_SUBARCH')):
|
for i in (('compiler', 'COMPILER'), ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'), ('kpkg-subarch', 'KPKG_SUBARCH')):
|
||||||
if config_entry.has_key(i[0]):
|
if config_entry.has_key(i[0]):
|
||||||
makeflags[i[1]] = config_entry[i[0]]
|
makeflags[i[1]] = config_entry[i[0]]
|
||||||
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
|
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
|
||||||
|
|
16
debian/templates/header-install.in → debian/bin/install-header
vendored
Normal file → Executable file
16
debian/templates/header-install.in → debian/bin/install-header
vendored
Normal file → Executable file
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
#
|
#
|
||||||
# This is the make-kpkg hook file, which runs when make-kpkg is invoked
|
# This is the make-kpkg hook file, which runs when make-kpkg is invoked
|
||||||
# (from debian/rules) to create the flavour-independent kernel-headers
|
# (from debian/rules) to create the flavour-independent kernel-headers
|
||||||
|
@ -6,6 +6,7 @@
|
||||||
# include/asm-* directories.
|
# include/asm-* directories.
|
||||||
#
|
#
|
||||||
set -e
|
set -e
|
||||||
|
set -x
|
||||||
|
|
||||||
# The scripts/ directory should be supplied for each flavour, since some
|
# The scripts/ directory should be supplied for each flavour, since some
|
||||||
# archs do some *very* strange things...
|
# archs do some *very* strange things...
|
||||||
|
@ -13,17 +14,16 @@ rm -rf scripts
|
||||||
|
|
||||||
# XXX: once we're using a linux-headers-$(version)-$(debnum) that's Arch: all,
|
# XXX: once we're using a linux-headers-$(version)-$(debnum) that's Arch: all,
|
||||||
# we'll want to drop this bit of code. The asm-* directories should remain.
|
# we'll want to drop this bit of code. The asm-* directories should remain.
|
||||||
|
DIRS="generic $KERNEL_HEADER_DIRS"
|
||||||
|
DIRS=($DIRS)
|
||||||
|
|
||||||
remove=
|
for i in include/asm-*; do
|
||||||
cd include
|
case ${i#include/asm-} in
|
||||||
for i in asm-*; do
|
$DIRS)
|
||||||
case ${i#asm-} in
|
|
||||||
generic | @headers_dirs@)
|
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
remove="$remove $i"
|
rm -rf "$i"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
${remove:+rm -r $remove}
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ include debian/rules.defs
|
||||||
# in Makefile.inc. @flavour@ in the expressions is going to be
|
# in Makefile.inc. @flavour@ in the expressions is going to be
|
||||||
# replaced by the flavour for which the command is run.
|
# replaced by the flavour for which the command is run.
|
||||||
#
|
#
|
||||||
kpkg_header := HEADER_CLEAN_HOOK='$(CURDIR)/$(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH)'
|
kpkg_header := HEADER_CLEAN_HOOK='$(CURDIR)/debian/bin/install-header'
|
||||||
kpkg_header += make-kpkg --append-to-version '$(KPKG_ABINAME)'
|
kpkg_header += make-kpkg --append-to-version '$(KPKG_ABINAME)'
|
||||||
kpkg_header += --arch '$(ARCH)'
|
kpkg_header += --arch '$(ARCH)'
|
||||||
kpkg_header += --stem linux
|
kpkg_header += --stem linux
|
||||||
|
@ -79,9 +79,6 @@ setup-arch: $(STAMPS_DIR)/source
|
||||||
setup-subarch: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)
|
setup-subarch: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)
|
||||||
setup-flavour: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
|
setup-flavour: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
|
||||||
|
|
||||||
$(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH): $(TEMPLATES_DIR)/header-install.in
|
|
||||||
sed -e 's,@headers_dirs@,$(headers_dirs),g' '$<' > '$@'
|
|
||||||
chmod u+x '$@'
|
|
||||||
#
|
#
|
||||||
# The way to make the correct package names is to make a
|
# The way to make the correct package names is to make a
|
||||||
# subarch-specific post-install script...
|
# subarch-specific post-install script...
|
||||||
|
@ -248,7 +245,7 @@ install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBAR
|
||||||
|
|
||||||
install-header-$(ARCH)-$(SUBARCH): SOURCE_DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)
|
install-header-$(ARCH)-$(SUBARCH): SOURCE_DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)
|
||||||
install-header-$(ARCH)-$(SUBARCH): DIR=$(BUILD_DIR)/$@
|
install-header-$(ARCH)-$(SUBARCH): DIR=$(BUILD_DIR)/$@
|
||||||
install-header-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH) $(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH)
|
install-header-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)
|
||||||
rm -rf '$(DIR)'
|
rm -rf '$(DIR)'
|
||||||
cp -al '$(SOURCE_DIR)' '$(DIR)'
|
cp -al '$(SOURCE_DIR)' '$(DIR)'
|
||||||
cd '$(DIR)'; $(setup_env) $(kpkg_header) kernel-headers
|
cd '$(DIR)'; $(setup_env) $(kpkg_header) kernel-headers
|
||||||
|
|
Loading…
Reference in New Issue