kernel-headers url is by default the same as kernel one, however it does not reflect -rc tarballs are no longer provided. Fix that.
Signed-off-by: Ladislav Michl <[email protected]> --- rules/kernel-header.make | 6 ++++++ rules/kernel.make | 16 ++-------------- rules/pre/kernel.make | 12 ++++++++++++ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/rules/kernel-header.make b/rules/kernel-header.make index 1a9327990..e8a1600d6 100644 --- a/rules/kernel-header.make +++ b/rules/kernel-header.make @@ -18,8 +18,14 @@ PACKAGES-$(PTXCONF_KERNEL_HEADER) += kernel-header # KERNEL_HEADER := linux-$(KERNEL_HEADER_VERSION) KERNEL_HEADER_MD5 := $(call remove_quotes,$(PTXCONF_KERNEL_HEADER_MD5)) +ifneq ($(KERNEL_HEADER_NEEDS_GIT_URL),y) KERNEL_HEADER_SUFFIX := tar.xz KERNEL_HEADER_URL := $(call kernel-url, KERNEL_HEADER) +else +KERNEL_HEADER_SUFFIX := tar.gz +KERNEL_HEADER_URL := https://git.kernel.org/torvalds/t/$(KERNEL_HEADER).$(KERNEL_HEADER_SUFFIX) +endif +KERNEL_HEADER_URL := $(call kernel-url, KERNEL_HEADER) KERNEL_HEADER_SOURCE := $(SRCDIR)/linux-$(KERNEL_HEADER_VERSION).$(KERNEL_HEADER_SUFFIX) KERNEL_HEADER_DIR := $(BUILDDIR)/kernel-header-$(KERNEL_HEADER_VERSION) KERNEL_HEADER_PKGDIR := $(PKGDIR)/kernel-header-$(KERNEL_HEADER_VERSION) diff --git a/rules/kernel.make b/rules/kernel.make index 8d254970f..d69224005 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -25,15 +25,6 @@ else KERNEL_BDIR := $(BUILDDIR) endif -# -# Starting with 4.12-rc1, Linus no longer provides signed tarballs for -# pre-release ("-rc") kernels. Download the version automatically generated -# by cgit. -# -ifneq ($(findstring -rc,$(KERNEL_VERSION)),) -KERNEL_NEEDS_GIT_URL := $(shell test $(KERNEL_VERSION_MAJOR) -ge 4 -a $(KERNEL_VERSION_MINOR) -ge 12 && echo y) -endif - # # Paths and names # @@ -41,17 +32,14 @@ KERNEL := linux-$(KERNEL_VERSION) KERNEL_MD5 := $(call remove_quotes,$(PTXCONF_KERNEL_MD5)) ifneq ($(KERNEL_NEEDS_GIT_URL),y) KERNEL_SUFFIX := tar.xz +KERNEL_URL := $(call kernel-url, KERNEL) else KERNEL_SUFFIX := tar.gz +KERNEL_URL := https://git.kernel.org/torvalds/t/$(KERNEL).$(KERNEL_SUFFIX) endif KERNEL_DIR := $(KERNEL_BDIR)/$(KERNEL) KERNEL_CONFIG := $(call remove_quotes, $(PTXDIST_PLATFORMCONFIGDIR)/$(PTXCONF_KERNEL_CONFIG)) KERNEL_LICENSE := GPL-2.0-only -ifneq ($(KERNEL_NEEDS_GIT_URL),y) -KERNEL_URL := $(call kernel-url, KERNEL) -else -KERNEL_URL := https://git.kernel.org/torvalds/t/$(KERNEL).$(KERNEL_SUFFIX) -endif KERNEL_SOURCE := $(SRCDIR)/$(KERNEL).$(KERNEL_SUFFIX) KERNEL_DEVPKG := NO diff --git a/rules/pre/kernel.make b/rules/pre/kernel.make index 3704c53a2..7d5056974 100644 --- a/rules/pre/kernel.make +++ b/rules/pre/kernel.make @@ -32,6 +32,18 @@ ifdef PTXCONF_ARCH_PPC GENERIC_KERNEL_ARCH := "powerpc" endif +# +# Starting with 4.12-rc1, Linus no longer provides signed tarballs for +# pre-release ("-rc") kernels. Download the version automatically generated +# by cgit. +# +ifneq ($(findstring -rc,$(KERNEL_VERSION)),) +KERNEL_NEEDS_GIT_URL := $(shell test $(KERNEL_VERSION_MAJOR) -ge 4 -a $(KERNEL_VERSION_MINOR) -ge 12 && echo y) +endif +ifneq ($(findstring -rc,$(KERNEL_HEADER_VERSION)),) +KERNEL_HEADER_NEEDS_GIT_URL := $(shell test $(KERNEL_HEADER_VERSION_MAJOR) -ge 4 -a $(KERNEL_HEADER_VERSION_MINOR) -ge 12 && echo y) +endif + KERNEL_HEADERS_DIR := $(PTXDIST_SYSROOT_TARGET)/kernel-headers KERNEL_HEADERS_INCLUDE_DIR := $(KERNEL_HEADERS_DIR)/include -- 2.17.0 _______________________________________________ ptxdist mailing list [email protected]
