Message ID | 20201202103414.18636-7-ynezz@true.cz |
---|---|
State | Accepted |
Delegated to: | Petr Štetiar |
Headers | show |
Series | [19.07,1/6] cmake.mk: set C/CXX compiler for host builds as well | expand |
Hi, > -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] > On Behalf Of Petr Štetiar > Sent: Mittwoch, 2. Dezember 2020 11:34 > To: openwrt-devel@lists.openwrt.org > Cc: Petr Štetiar <ynezz@true.cz> > Subject: [PATCH 19.07 6/6] toolchain: kernel-headers: kernel Git tree mirror > hash > > Allow setting of mirror hash for Git kernel tree. Not sure whether backporting this very patch is absolutely necessary, but it shouldn't hurt either. Best Adrian > > Signed-off-by: Petr Štetiar <ynezz@true.cz> (cherry picked from commit > 796d51834c5be85771d26e433fd509cd3bef72e3) > --- > config/Config-devel.in | 5 +++++ > toolchain/kernel-headers/Makefile | 1 + > 2 files changed, 6 insertions(+) > > diff --git a/config/Config-devel.in b/config/Config-devel.in index > fd7c3ead1e8e..1c514f86d424 100644 > --- a/config/Config-devel.in > +++ b/config/Config-devel.in > @@ -100,6 +100,11 @@ menuconfig DEVEL > It can be a git hash or a branch name. > If unused, the clone's repository HEAD will be checked-out. > > + config KERNEL_GIT_MIRROR_HASH > + string "Enter hash of Git kernel tree source checkout tarball" > if DEVEL > + depends on (KERNEL_GIT_CLONE_URI != "") > + default "" > + > config BUILD_LOG > bool "Enable log files during build process" if DEVEL > help > diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel- > headers/Makefile > index 1da1946a149c..69318814937a 100644 > --- a/toolchain/kernel-headers/Makefile > +++ b/toolchain/kernel-headers/Makefile > @@ -21,6 +21,7 @@ ifneq ($(call > qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),) > PKG_SOURCE_PROTO:=git > PKG_SOURCE_URL:=$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)) > PKG_SOURCE_VERSION:=$(call qstrip,$(CONFIG_KERNEL_GIT_REF)) > + PKG_MIRROR_HASH:=$(call > qstrip,$(CONFIG_KERNEL_GIT_MIRROR_HASH)) > ifdef CHECK > include $(INCLUDE_DIR)/kernel-version.mk > PKG_VERSION:=$(LINUX_VERSION) > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Adrian Schmutzler <mail@adrianschmutzler.de> [2020-12-02 15:55:18]: Hi, > > Allow setting of mirror hash for Git kernel tree. > > Not sure whether backporting this very patch is absolutely necessary, but it shouldn't hurt either. it's not obvious, but it's needed with patch 5/6, otherwise you can't set mirror hash and thus can't check validity of the local source tarball. Cheers, Petr
diff --git a/config/Config-devel.in b/config/Config-devel.in index fd7c3ead1e8e..1c514f86d424 100644 --- a/config/Config-devel.in +++ b/config/Config-devel.in @@ -100,6 +100,11 @@ menuconfig DEVEL It can be a git hash or a branch name. If unused, the clone's repository HEAD will be checked-out. + config KERNEL_GIT_MIRROR_HASH + string "Enter hash of Git kernel tree source checkout tarball" if DEVEL + depends on (KERNEL_GIT_CLONE_URI != "") + default "" + config BUILD_LOG bool "Enable log files during build process" if DEVEL help diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 1da1946a149c..69318814937a 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -21,6 +21,7 @@ ifneq ($(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)) PKG_SOURCE_VERSION:=$(call qstrip,$(CONFIG_KERNEL_GIT_REF)) + PKG_MIRROR_HASH:=$(call qstrip,$(CONFIG_KERNEL_GIT_MIRROR_HASH)) ifdef CHECK include $(INCLUDE_DIR)/kernel-version.mk PKG_VERSION:=$(LINUX_VERSION)
Allow setting of mirror hash for Git kernel tree. Signed-off-by: Petr Štetiar <ynezz@true.cz> (cherry picked from commit 796d51834c5be85771d26e433fd509cd3bef72e3) --- config/Config-devel.in | 5 +++++ toolchain/kernel-headers/Makefile | 1 + 2 files changed, 6 insertions(+)