@@ -1,2 +1 @@
archs="amd64 armhf arm64 ppc64el s390x"
-family='ubuntu'
@@ -31,8 +31,6 @@ upstream_version := $(shell sed -n 's/^VERSION = \(.*\)$$/\1/p' Makefile)
upstream_patchlevel := $(shell sed -n 's/^PATCHLEVEL = \(.*\)$$/\1/p' Makefile)
upstream_tag := "v$(upstream_version).$(upstream_patchlevel)"
-family=ubuntu
-
# This is an internally used mechanism for the daily kernel builds. It
# creates packages whose ABI is suffixed with a minimal representation of
# the current git HEAD sha. If .git/HEAD is not present, then it uses the
@@ -24,7 +24,7 @@ $(stampdir)/stamp-prepare-%: config-prepare-check-%
@echo Debug: $@
@touch $@
$(stampdir)/stamp-prepare-tree-%: target_flavour = $*
-$(stampdir)/stamp-prepare-tree-%: $(commonconfdir)/config.common.$(family) $(archconfdir)/config.common.$(arch) $(archconfdir)/config.flavour.% debian/scripts/fix-filenames
+$(stampdir)/stamp-prepare-tree-%: $(commonconfdir)/config.common.ubuntu $(archconfdir)/config.common.$(arch) $(archconfdir)/config.flavour.% debian/scripts/fix-filenames
@echo Debug: $@
install -d $(builddir)/build-$*
touch $(builddir)/build-$*/ubuntu-build
@@ -30,7 +30,7 @@ variant="$2"
. $DEBIAN/etc/kernelconfig
bindir="`pwd`/${DROOT}/scripts/misc"
-common_conf="$confdir/config.common.$family"
+common_conf="$confdir/config.common.ubuntu"
tmpdir=`mktemp -d`
mkdir "$tmpdir/CONFIGS"
With the removal of family=ports, all that's left is family=ubuntu, so hard- code that and drop the 'family' script and Makefile variables. No functional changes. Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> --- debian.master/etc/kernelconfig | 1 - debian/rules.d/0-common-vars.mk | 2 -- debian/rules.d/2-binary-arch.mk | 2 +- debian/scripts/misc/kernelconfig | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-)