From a03db36fedc24f5f4548f2a7edf9178e281e7b70 Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Tue, 29 Oct 2024 13:06:39 +0300 Subject: [PATCH] more package name fixes --- debian/.gitignore | 1 + debian/rules | 18 +++++++++--------- debian/rules.real | 10 +++++----- debian/source/lintian-overrides | 2 +- debian/templates/headers.control.in | 4 ++-- debian/templates/headers.featureset.control.in | 4 ++-- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/debian/.gitignore b/debian/.gitignore index 376a1bb..c2abf73 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -23,6 +23,7 @@ /files /generated.*/ /linux-* +/krd-linux-* /rules.gen !/linux-bpf-dev.* !/linux-cpupower.* diff --git a/debian/rules b/debian/rules index 0c3fdb9..d38306c 100755 --- a/debian/rules +++ b/debian/rules @@ -58,15 +58,15 @@ clean-generated: rm -f \ debian/control \ debian/control.md5sum \ - debian/linux-headers-*.maintscript \ - debian/linux-headers-*.postinst \ - debian/linux-image-*.lintian-overrides \ - debian/linux-image-*.maintscript \ - debian/linux-image-*.postinst \ - debian/linux-image-*.postrm \ - debian/linux-image-*.preinst \ - debian/linux-image-*.prerm \ - debian/linux-source.maintscript \ + debian/krd-linux-headers-*.maintscript \ + debian/krd-linux-headers-*.postinst \ + debian/krd-linux-image-*.lintian-overrides \ + debian/krd-linux-image-*.maintscript \ + debian/krd-linux-image-*.postinst \ + debian/krd-linux-image-*.postrm \ + debian/krd-linux-image-*.preinst \ + debian/krd-linux-image-*.prerm \ + debian/krd-linux-source.maintscript \ debian/rules.gen maintainerclean: clean-generated diff --git a/debian/rules.real b/debian/rules.real index c620cfb..41f8ce0 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -178,7 +178,7 @@ $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(ABINAME)$(LOCALVERSION) $(STAMPS_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) $(STAMPS_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR): INSTALL_DIR=$(BUILD_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR) -$(STAMPS_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DT_INSTALL_DIR = $(INSTALL_DIR)/usr/lib/linux-image-$(REAL_VERSION) +$(STAMPS_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DT_INSTALL_DIR = $(INSTALL_DIR)/usr/lib/krd-linux-image-$(REAL_VERSION) $(STAMPS_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) install -D -m644 '$(DIR)/$(IMAGE_FILE)' $(INSTALL_DIR)/boot/$(IMAGE_INSTALL_STEM)-$(REAL_VERSION) ifeq ($(IMAGE_FILE),vmlinux) @@ -233,7 +233,7 @@ binary_meta: build_headers-common: -binary_headers-common: PACKAGE_NAME_KBUILD = linux-kbuild-$(ABINAME) +binary_headers-common: PACKAGE_NAME_KBUILD = krd-linux-kbuild-$(ABINAME) binary_headers-common: BASE_DIR = /usr/src/$(PACKAGE_NAME) binary_headers-common: SOURCE_DIR = $(BUILD_DIR)/source_$(FEATURESET) binary_headers-common: DIR = $(DESTDIR)/$(BASE_DIR) @@ -261,8 +261,8 @@ binary_headers-common: $(STAMPS_DIR)/source_$(FEATURESET) build_headers: binary_headers: REAL_VERSION = $(ABINAME)$(LOCALVERSION) -binary_headers: PACKAGE_NAME_COMMON = linux-headers-$(ABINAME)-common$(LOCALVERSION_HEADERS) -binary_headers: PACKAGE_NAME_KBUILD = linux-kbuild-$(ABINAME) +binary_headers: PACKAGE_NAME_COMMON = krd-linux-headers-$(ABINAME)-common$(LOCALVERSION_HEADERS) +binary_headers: PACKAGE_NAME_KBUILD = krd-linux-kbuild-$(ABINAME) binary_headers: BASE_DIR = /usr/src/$(PACKAGE_NAME) binary_headers: BASE_DIR_COMMON = /usr/src/$(PACKAGE_NAME_COMMON) binary_headers: SOURCE_DIR = $(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) @@ -389,7 +389,7 @@ binary_source: $(BUILD_DIR)/$(SOURCE_BASENAME)-source-$(UPSTREAMVERSION).tar.xz build_config: binary_config: TRIPLETS = $(subst $(BUILD_DIR)/build_,,$(wildcard $(BUILD_DIR)/build_$(ARCH)_*_*)) -binary_config: CONFDIR = usr/src/linux-config-$(UPSTREAMVERSION) +binary_config: CONFDIR = usr/src/krd-linux-config-$(UPSTREAMVERSION) binary_config: $(dh_binary_pre) dh_installdirs /$(CONFDIR) diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index b63773f..0ca5804 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -20,4 +20,4 @@ linux source: source-contains-prebuilt-windows-binary *tools/perf/tests/pe-file. # Headers depends on the correct version of images, which might be # signed. -linux source: version-substvar-for-external-package Depends ${binary:Version} linux-headers-* +linux source: version-substvar-for-external-package Depends ${binary:Version} krd-linux-headers-* diff --git a/debian/templates/headers.control.in b/debian/templates/headers.control.in index 1809293..57226e6 100644 --- a/debian/templates/headers.control.in +++ b/debian/templates/headers.control.in @@ -10,6 +10,6 @@ Description: Header files for KrD's Linux kernel @abiname@@localversion@ This package provides the architecture-specific kernel header files for Linux kernel @abiname@@localversion@, generally used for building out-of-tree kernel modules. These files are going to be - installed into /usr/src/linux-headers-@abiname@@localversion@, and can + installed into /usr/src/krd-linux-headers-@abiname@@localversion@, and can be used for building modules that load into the kernel provided by the - linux-image-@abiname@@localversion@ package. + krd-linux-image-@abiname@@localversion@ package. diff --git a/debian/templates/headers.featureset.control.in b/debian/templates/headers.featureset.control.in index 25001b7..b9e8df9 100644 --- a/debian/templates/headers.featureset.control.in +++ b/debian/templates/headers.featureset.control.in @@ -8,8 +8,8 @@ Description: Common header files for KrD's Linux kernel @abiname@@localversion@ This package provides the common kernel header files for Linux kernel version @abiname@@featureset_desc@, generally used for building out-of-tree kernel modules. These files are going to be installed into - /usr/src/linux-headers-@abiname@-common@localversion@. + /usr/src/krd-linux-headers-@abiname@-common@localversion@. . To obtain a complete set of headers you also need to install the - linux-headers-@abiname@-(flavour) package, matching the flavour of + krd-linux-headers-@abiname@-(flavour) package, matching the flavour of the kernel you intend the build for.