diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 08c4f7f91..6c0701dce 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -61,7 +61,6 @@ class Gencontrol(Base): 'VERSION': self.version.linux_version, 'UPSTREAMVERSION': self.version.linux_upstream, 'ABINAME': self.abiname_version + self.abiname_part, - 'ABINAME_PART': self.abiname_part, 'SOURCEVERSION': self.version.complete, }) @@ -131,7 +130,6 @@ class Gencontrol(Base): abiname_part = self.abiname_part makeflags['ABINAME'] = vars['abiname'] = \ self.abiname_version + abiname_part - makeflags['ABINAME_PART'] = abiname_part if foreign_kernel: packages_headers_arch = [] diff --git a/debian/rules.real b/debian/rules.real index 21d62380a..6f16e14dc 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -36,7 +36,7 @@ include debian/rules.defs stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@ -setup_env := env -u ABINAME -u ABINAME_PART -u ARCH -u FEATURESET -u FLAVOUR -u VERSION -u LOCALVERSION +setup_env := env -u ABINAME -u ARCH -u FEATURESET -u FLAVOUR -u VERSION -u LOCALVERSION setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTOR="$(DISTRIBUTOR)" DISTRIBUTION_VERSION="$(SOURCEVERSION)" KBUILD_BUILD_TIMESTAMP="$(DISTRIBUTOR) $(SOURCEVERSION) ($(SOURCE_DATE_UTC_ISO))" KBUILD_BUILD_USER="$(word 1,$(subst @, ,$(MAINTAINER)))" KBUILD_BUILD_HOST="$(word 2,$(subst @, ,$(MAINTAINER)))" MAKE_CLEAN = $(setup_env) $(MAKE)