diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:18:09 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:18:13 +0000 |
commit | 225809f918c2f2c9c831ea16ddb9b81485af5f34 (patch) | |
tree | 5332d51631f39fc96804d8001996f028bbbbdf54 /debian/rules.real | |
parent | Merging upstream version 6.10.3. (diff) | |
download | linux-225809f918c2f2c9c831ea16ddb9b81485af5f34.tar.xz linux-225809f918c2f2c9c831ea16ddb9b81485af5f34.zip |
Merging debian version 6.10.3-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/rules.real')
-rw-r--r-- | debian/rules.real | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/debian/rules.real b/debian/rules.real index ce5e58d9f0..f2246fdbc9 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -155,6 +155,7 @@ endif echo 'DEBIAN_KERNEL_NO_CC_VERSION_CHECK = y' >> '$(DIR)/.kernelvariables' +$(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' listnewconfig +yes "" | $(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' oldconfig >/dev/null + debian/bin/buildcheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR) setup @$(stamp) $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source_$(FEATURESET) @@ -163,17 +164,7 @@ $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/setup_$(ARCH $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR): +$(MAKE_CLEAN) -C '$(DIR)' - - mkdir -p $(DIR)/tools/bpf/bpftool - +$(MAKE_CLEAN) -C '$(SOURCE_DIR)/tools/bpf/bpftool' O=$(DIR)/tools/bpf/bpftool CROSS_COMPILE= FEATURE_TESTS= FEATURE_DISPLAY= - - if grep -q CONFIG_DEBUG_INFO_BTF=y $(DIR)/.config; then \ - $(DIR)/tools/bpf/bpftool/bpftool btf dump file $(DIR)/vmlinux format c > $(DIR)/vmlinux.h; \ - else \ - echo '#error "Kernel build without CONFIG_DEBUG_INFO_BTF, no type info available"' > $(DIR)/vmlinux.h; \ - fi - - debian/bin/buildcheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR) + debian/bin/buildcheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR) build @$(stamp) $(STAMPS_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(ABINAME)$(LOCALVERSION) @@ -322,7 +313,7 @@ binary_headers: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) $(dh_binary_pre) mkdir -p $(DIR)/arch/$(KERNEL_ARCH)/kernel - cp -a $(SOURCE_DIR)/{.config,.kernel*,Module.symvers,include,vmlinux.h} $(DIR) + cp -a $(SOURCE_DIR)/{.config,.kernel*,Module.symvers,include} $(DIR) cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/include $(DIR)/arch/$(KERNEL_ARCH) find $(DIR) -name '*.cmd' -delete @@ -370,6 +361,23 @@ binary_libc-dev: $(STAMPS_DIR)/build_libc-dev $(dh_binary_post) +build_bpf-dev: SOURCE_DIR=$(BUILD_DIR)/source_$(FEATURESET) +build_bpf-dev: DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) +build_bpf-dev: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) + mkdir -p $(DIR)/tools/bpf/bpftool + +$(MAKE_CLEAN) -C '$(SOURCE_DIR)/tools/bpf/bpftool' O=$(CURDIR)/$(DIR)/tools/bpf/bpftool CROSS_COMPILE= FEATURE_TESTS= FEATURE_DISPLAY= + + if grep -q CONFIG_DEBUG_INFO_BTF=y $(DIR)/.config; then \ + $(DIR)/tools/bpf/bpftool/bpftool btf dump file $(DIR)/vmlinux format c > $(DIR)/vmlinux.h; \ + else \ + echo '#error "Kernel build without CONFIG_DEBUG_INFO_BTF, no type info available"' > $(DIR)/vmlinux.h; \ + fi + +binary_bpf-dev: DH_INSTALL_ARGS = --sourcedir=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR) +binary_bpf-dev: build_bpf-dev + $(dh_binary_pre) + $(dh_binary_post) + build_support: binary_support: PACKAGE_ROOT = /usr/share/$(PACKAGE_NAME) @@ -653,7 +661,7 @@ build_hyperv-daemons: $(STAMPS_DIR)/build-tools-headers binary_hyperv-daemons: build_hyperv-daemons $(dh_binary_pre) $(call make-tools,tools/hv) install - for service in fcopy kvp vss; do \ + for service in kvp vss; do \ dh_installsystemd --name hv-$$service-daemon --no-enable --no-start \ || break; \ dh_installinit --name hv-$$service-daemon \ |