krd/linux
1
0
Fork 0
Code

more package name fixes

Browse Source
This commit is contained in:
Konstantin Demin 2024-10-29 13:06:39 +03:00
parent 126da1f29b
commit a03db36fed
6 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/.gitignore vendored
View File

@ -23,6 +23,7 @@
/files /files
/generated.*/ /generated.*/
/linux-* /linux-*
/krd-linux-*
/rules.gen /rules.gen
!/linux-bpf-dev.* !/linux-bpf-dev.*
!/linux-cpupower.* !/linux-cpupower.*

18
debian/rules vendored
View File

@ -58,15 +58,15 @@ clean-generated:
rm -f \ rm -f \
debian/control \ debian/control \
debian/control.md5sum \ debian/control.md5sum \
debian/linux-headers-*.maintscript \ debian/krd-linux-headers-*.maintscript \
debian/linux-headers-*.postinst \ debian/krd-linux-headers-*.postinst \
debian/linux-image-*.lintian-overrides \ debian/krd-linux-image-*.lintian-overrides \
debian/linux-image-*.maintscript \ debian/krd-linux-image-*.maintscript \
debian/linux-image-*.postinst \ debian/krd-linux-image-*.postinst \
debian/linux-image-*.postrm \ debian/krd-linux-image-*.postrm \
debian/linux-image-*.preinst \ debian/krd-linux-image-*.preinst \
debian/linux-image-*.prerm \ debian/krd-linux-image-*.prerm \
debian/linux-source.maintscript \ debian/krd-linux-source.maintscript \
debian/rules.gen debian/rules.gen
maintainerclean: clean-generated maintainerclean: clean-generated

10
debian/rules.real vendored
View File

@ -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): REAL_VERSION = $(ABINAME)$(LOCALVERSION)
$(STAMPS_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) $(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): 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) $(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) install -D -m644 '$(DIR)/$(IMAGE_FILE)' $(INSTALL_DIR)/boot/$(IMAGE_INSTALL_STEM)-$(REAL_VERSION)
ifeq ($(IMAGE_FILE),vmlinux) ifeq ($(IMAGE_FILE),vmlinux)
@ -233,7 +233,7 @@ binary_meta:
build_headers-common: 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: BASE_DIR = /usr/src/$(PACKAGE_NAME)
binary_headers-common: SOURCE_DIR = $(BUILD_DIR)/source_$(FEATURESET) binary_headers-common: SOURCE_DIR = $(BUILD_DIR)/source_$(FEATURESET)
binary_headers-common: DIR = $(DESTDIR)/$(BASE_DIR) binary_headers-common: DIR = $(DESTDIR)/$(BASE_DIR)
@ -261,8 +261,8 @@ binary_headers-common: $(STAMPS_DIR)/source_$(FEATURESET)
build_headers: build_headers:
binary_headers: REAL_VERSION = $(ABINAME)$(LOCALVERSION) binary_headers: REAL_VERSION = $(ABINAME)$(LOCALVERSION)
binary_headers: PACKAGE_NAME_COMMON = linux-headers-$(ABINAME)-common$(LOCALVERSION_HEADERS) binary_headers: PACKAGE_NAME_COMMON = krd-linux-headers-$(ABINAME)-common$(LOCALVERSION_HEADERS)
binary_headers: PACKAGE_NAME_KBUILD = linux-kbuild-$(ABINAME) binary_headers: PACKAGE_NAME_KBUILD = krd-linux-kbuild-$(ABINAME)
binary_headers: BASE_DIR = /usr/src/$(PACKAGE_NAME) binary_headers: BASE_DIR = /usr/src/$(PACKAGE_NAME)
binary_headers: BASE_DIR_COMMON = /usr/src/$(PACKAGE_NAME_COMMON) binary_headers: BASE_DIR_COMMON = /usr/src/$(PACKAGE_NAME_COMMON)
binary_headers: SOURCE_DIR = $(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) 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: build_config:
binary_config: TRIPLETS = $(subst $(BUILD_DIR)/build_,,$(wildcard $(BUILD_DIR)/build_$(ARCH)_*_*)) 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: binary_config:
$(dh_binary_pre) $(dh_binary_pre)
dh_installdirs /$(CONFDIR) dh_installdirs /$(CONFDIR)

2
debian/source/lintian-overrides vendored
View File

@ -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 # Headers depends on the correct version of images, which might be
# signed. # 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-*

4
debian/templates/headers.control.in vendored
View File

@ -10,6 +10,6 @@ Description: Header files for KrD's Linux kernel @abiname@@localversion@
This package provides the architecture-specific kernel header files This package provides the architecture-specific kernel header files
for Linux kernel @abiname@@localversion@, generally for Linux kernel @abiname@@localversion@, generally
used for building out-of-tree kernel modules. These files are going to be 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 be used for building modules that load into the kernel provided by the
linux-image-@abiname@@localversion@ package. krd-linux-image-@abiname@@localversion@ package.

4
debian/templates/headers.featureset.control.in vendored
View File

@ -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 This package provides the common kernel header files for Linux kernel
version @abiname@@featureset_desc@, generally used for building version @abiname@@featureset_desc@, generally used for building
out-of-tree kernel modules. These files are going to be installed into 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 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. the kernel you intend the build for.