@@ -30,27 +30,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)"
-# 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
-# uuidgen program,
-#
-# AUTOBUILD can also be used by anyone wanting to build a custom kernel
-# image, or rebuild the entire set of Ubuntu packages using custom patches
-# or configs.
-AUTOBUILD=
-
-ifneq ($(AUTOBUILD),)
-skipabi = true
-skipmodule = true
-skipretpoline = true
-skipdbg = true
-gitver=$(shell if test -f .git/HEAD; then cat .git/HEAD; else uuidgen; fi)
-gitverpre=$(shell echo $(gitver) | cut -b -3)
-gitverpost=$(shell echo $(gitver) | cut -b 38-40)
-abi_suffix = -$(gitverpre)$(gitverpost)
-endif
-
ifneq ($(NOKERNLOG),)
ubuntu_log_opts += --no-kern-log
endif
@@ -78,8 +57,8 @@ ifeq ($(full_build),false)
skipdbg=true
endif
-abinum := $(firstword $(subst .,$(space),$(revision)))$(abi_suffix)
-prev_abinum := $(firstword $(subst .,$(space),$(prev_revision)))$(abi_suffix)
+abinum := $(firstword $(subst .,$(space),$(revision)))
+prev_abinum := $(firstword $(subst .,$(space),$(prev_revision)))
abi_release := $(release)-$(abinum)
uploadnum := $(patsubst $(abinum).%,%,$(revision))
@@ -143,7 +122,7 @@ hdrs_pkg_name=linux-headers-$(abi_release)
indep_hdrs_pkg_name=$(src_pkg_name)-headers-$(abi_release)
#
-# The generation of content in the doc package depends on both 'AUTOBUILD=' and
+# The generation of content in the doc package depends on
# 'do_doc_package_content=true'. There are usually build errors during the development
# cycle, so its OK to leave 'do_doc_package_content=false' until those build
# failures get sorted out. Finally, the doc package doesn't really need to be built
@@ -79,7 +79,6 @@ printenv:
@echo "prev_revision = $(prev_revision)"
@echo "abinum = $(abinum)"
@echo "upstream_tag = $(upstream_tag)"
- @echo "gitver = $(gitver)"
@echo "variants = $(variants)"
@echo "flavours = $(flavours)"
@echo "skipabi = $(skipabi)"
@@ -834,11 +834,7 @@ build-arch-deps-$(do_flavour_image_package) += $(addprefix $(stampdir)/stamp-ins
build-arch: $(build-arch-deps-true)
@echo Debug: $@
-ifeq ($(AUTOBUILD),)
binary-arch-deps-$(do_flavour_image_package) += binary-debs
-else
-binary-arch-deps-$(do_flavour_image_package) = binary-debs
-endif
binary-arch-deps-$(do_libc_dev_package) += binary-arch-headers
ifneq ($(do_common_headers_indep),true)
binary-arch-deps-$(do_flavour_header_package) += binary-headers
@@ -40,14 +40,12 @@ ifeq ($(do_doc_package),true)
install -d $(docdir)
ifeq ($(do_doc_package_content),true)
# First the html docs. We skip these for autobuilds
- if [ -z "$(AUTOBUILD)" ]; then \
- install -d $(docdir)/$(doc_pkg_name)-tmp; \
- $(kmake) O=$(docdir)/$(doc_pkg_name)-tmp htmldocs; \
- install -d $(docdir)/html; \
- rsync -aL $(docdir)/$(doc_pkg_name)-tmp/Documentation/output/ \
- $(docdir)/html/; \
- rm -rf $(docdir)/$(doc_pkg_name)-tmp; \
- fi
+ install -d $(docdir)/$(doc_pkg_name)-tmp
+ $(kmake) O=$(docdir)/$(doc_pkg_name)-tmp htmldocs
+ install -d $(docdir)/html
+ rsync -aL $(docdir)/$(doc_pkg_name)-tmp/Documentation/output/ \
+ $(docdir)/html/
+ rm -rf $(docdir)/$(doc_pkg_name)-tmp
endif
# Copy the rest
cp -a Documentation/* $(docdir)
AUTOBUILD is a Ben Collins mechanism introduced in 2007 for daily kernel builds on internal builders. It hasn't been used in ages so drop it. Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> --- debian/rules.d/0-common-vars.mk | 27 +++------------------------ debian/rules.d/1-maintainer.mk | 1 - debian/rules.d/2-binary-arch.mk | 4 ---- debian/rules.d/3-binary-indep.mk | 14 ++++++-------- 4 files changed, 9 insertions(+), 37 deletions(-)