From 4b3357e85ce5ffa88027ac4960f9be5c2711f6f5 Mon Sep 17 00:00:00 2001 From: Juerg Haefliger Date: Mon, 9 Jan 2023 14:59:07 +0100 Subject: [PATCH] UBUNTU: [Packaging] debian/rules: Drop NOKERNLOG and PRINTSHAS env variables The env variables NOKERNLOG and PRINTSHAS were introduced in 2007 for some special case and to retain old behavior when generating the changelog. That hasn't been used in ages and git-ubuntu-log doesn't even support it anymore since 2016 so drop it all. Signed-off-by: Juerg Haefliger Signed-off-by: Andrea Righi --- debian/rules.d/0-common-vars.mk | 7 ------- debian/rules.d/1-maintainer.mk | 5 +---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index cd4ffd92e009..7fbff78a47fb 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -30,13 +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)" -ifneq ($(NOKERNLOG),) -ubuntu_log_opts += --no-kern-log -endif -ifneq ($(PRINTSHAS),) -ubuntu_log_opts += --print-shas -endif - # Get the kernels own extra version to be added to the release signature. raw_kernelversion=$(shell make kernelversion) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 2ff4fe60851f..41d61adbd8ac 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -33,10 +33,8 @@ help: @echo @echo "Environment variables:" @echo - @echo " NOKERNLOG : Do not add upstream kernel commits to changelog" @echo " CONCURRENCY_LEVEL=X" @echo " : Use -jX for kernel compile" - @echo " PRINTSHAS : Include SHAs for commits in changelog" .PHONY: printdebian printdebian: @@ -84,7 +82,6 @@ printenv: @echo "skipabi = $(skipabi)" @echo "skipmodule = $(skipmodule)" @echo "skipdbg = $(skipdbg)" - @echo "ubuntu_log_opts = $(ubuntu_log_opts)" @echo "CONCURRENCY_LEVEL = $(CONCURRENCY_LEVEL)" @echo "ubuntu_selftests = $(ubuntu_selftests)" @echo "bin package name = $(bin_pkg_name)" @@ -132,7 +129,7 @@ printchanges: gawk '/UBUNTU:\s*Ubuntu-.*$$/ { print $$1; exit }'); \ fi; \ git log "$$baseCommit"..HEAD | \ - $(DROOT)/scripts/misc/git-ubuntu-log $(ubuntu_log_opts) + $(DROOT)/scripts/misc/git-ubuntu-log insertchanges: autoreconstruct finalchecks $(DROOT)/scripts/misc/insert-changes $(DROOT) $(DEBIAN)