From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: James Hilliard <james.hilliard1@gmail.com>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/1] package/bpftool: bump to version 7.0.0
Date: Sat, 1 Oct 2022 18:47:32 +0200 [thread overview]
Message-ID: <20221001164732.GI30794@scaer> (raw)
In-Reply-To: <20220929234406.374167-1-james.hilliard1@gmail.com>
James, All,
On 2022-09-29 17:44 -0600, James Hilliard spake thusly:
> Drop patch which is now upstream.
>
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> ...strapping-during-a-cross-compilation.patch | 96 -------------------
> package/bpftool/bpftool.hash | 2 +-
> package/bpftool/bpftool.mk | 2 +-
> 3 files changed, 2 insertions(+), 98 deletions(-)
> delete mode 100644 package/bpftool/0001-bpftool-Fix-bootstrapping-during-a-cross-compilation.patch
>
> diff --git a/package/bpftool/0001-bpftool-Fix-bootstrapping-during-a-cross-compilation.patch b/package/bpftool/0001-bpftool-Fix-bootstrapping-during-a-cross-compilation.patch
> deleted file mode 100644
> index fc192681e3..0000000000
> --- a/package/bpftool/0001-bpftool-Fix-bootstrapping-during-a-cross-compilation.patch
> +++ /dev/null
> @@ -1,96 +0,0 @@
> -From 189f777ea4829bede0bf92f572c22fe1f2c37522 Mon Sep 17 00:00:00 2001
> -From: Shahab Vahedi <Shahab.Vahedi@synopsys.com>
> -Date: Wed, 8 Jun 2022 14:29:28 +0000
> -Subject: [PATCH] bpftool: Fix bootstrapping during a cross compilation
> -
> -This change adjusts the Makefile to use "HOSTAR" as the archive tool
> -to keep the sanity of the build process for the bootstrap part in
> -check. For the rationale, please continue reading.
> -
> -When cross compiling bpftool with buildroot, it leads to an invocation
> -like:
> -
> -$ AR="/path/to/buildroot/host/bin/arc-linux-gcc-ar" \
> - CC="/path/to/buildroot/host/bin/arc-linux-gcc" \
> - ...
> - make
> -
> -Which in return fails while building the bootstrap section:
> -
> -----------------------------------8<----------------------------------
> -
> - make: Entering directory '/src/bpftool-v6.7.0/src'
> - ... libbfd: [ on ]
> - ... disassembler-four-args: [ on ]
> - ... zlib: [ on ]
> - ... libcap: [ OFF ]
> - ... clang-bpf-co-re: [ on ] <-- triggers bootstrap
> -
> - .
> - .
> - .
> -
> - LINK /src/bpftool-v6.7.0/src/bootstrap/bpftool
> - /usr/bin/ld: /src/bpftool-v6.7.0/src/bootstrap/libbpf/libbpf.a:
> - error adding symbols: archive has no index; run ranlib
> - to add one
> - collect2: error: ld returned 1 exit status
> - make: *** [Makefile:211: /src/bpftool-v6.7.0/src/bootstrap/bpftool]
> - Error 1
> - make: *** Waiting for unfinished jobs....
> - AR /src/bpftool-v6.7.0/src/libbpf/libbpf.a
> - make[1]: Leaving directory '/src/bpftool-v6.7.0/libbpf/src'
> - make: Leaving directory '/src/bpftool-v6.7.0/src'
> -
> ----------------------------------->8----------------------------------
> -
> -This occurs because setting "AR" confuses the build process for the
> -bootstrap section and it calls "arc-linux-gcc-ar" to create and index
> -"libbpf.a" instead of the host "ar".
> -
> -Signed-off-by: Shahab Vahedi <shahab@synopsys.com>
> -Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
> -Reviewed-by: Quentin Monnet <quentin@isovalent.com>
> -Cc: Jean-Philippe Brucker <jean-philippe@linaro.org>
> -Link: https://lore.kernel.org/bpf/8d297f0c-cfd0-ef6f-3970-6dddb3d9a87a@synopsys.com
> -Upstream: https://github.com/libbpf/bpftool/commit/189f777ea4829bede0bf92f572c22fe1f2c37522
> -
> -This is an adapted version, else it won't be possible to cross compile
> -bpftool if "clang-bpf-co-re" feature is enabled.
> ----
> - src/Makefile | 2 +-
> - src/Makefile.include | 2 ++
> - 2 file changed, 3 insertions(+), 1 deletion(-)
> -
> -diff --git a/src/Makefile b/src/Makefile
> -index b657502..b8b0808 100644
> ---- a/src/Makefile
> -+++ b/src/Makefile
> -@@ -51,7 +51,7 @@ $(LIBBPF_INTERNAL_HDRS): $(LIBBPF_HDRS_DIR)/%.h: $(BPF_DIR)/%.h | $(LIBBPF_HDRS_
> - $(LIBBPF_BOOTSTRAP): $(wildcard $(BPF_DIR)/*.[ch] $(BPF_DIR)/Makefile) | $(LIBBPF_BOOTSTRAP_OUTPUT)
> - $(Q)$(MAKE) -C $(BPF_DIR) OBJDIR=$(patsubst %/,%,$(LIBBPF_BOOTSTRAP_OUTPUT)) \
> - PREFIX=$(LIBBPF_BOOTSTRAP_DESTDIR:/=) \
> -- ARCH= CROSS_COMPILE= CC=$(HOSTCC) LD=$(HOSTLD) $@ install_headers
> -+ ARCH= CROSS_COMPILE= CC=$(HOSTCC) LD=$(HOSTLD) AR=$(HOSTAR) $@ install_headers
> -
> - $(LIBBPF_BOOTSTRAP_INTERNAL_HDRS): $(LIBBPF_BOOTSTRAP_HDRS_DIR)/%.h: $(BPF_DIR)/%.h | $(LIBBPF_BOOTSTRAP_HDRS_DIR)
> - $(call QUIET_INSTALL, $@)
> ---- a/src/Makefile.include
> -+++ b/src/Makefile.include
> -@@ -12,11 +12,13 @@
> - ifneq ($(LLVM),)
> - $(if $(findstring default,$(origin CC)),$(eval CC := clang$(LLVM_VERSION)))
> - $(if $(findstring default,$(origin LD)),$(eval LD := ld.lld$(LLVM_VERSION)))
> -+ HOSTAR ?= llvm-ar
> - HOSTCC ?= clang
> - HOSTLD ?= ld.lld
> - else
> - $(if $(findstring default,$(origin CC)),$(eval CC = $(CROSS_COMPILE)$(CC)))
> - $(if $(findstring default,$(origin LD)),$(eval LD = $(CROSS_COMPILE)$(LD)))
> -+ HOSTAR ?= ar
> - HOSTCC ?= gcc
> - HOSTLD ?= ld
> - endif
> ---
> -2.35.3
> -
> diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash
> index 5fbc25adb7..92b9359fe3 100644
> --- a/package/bpftool/bpftool.hash
> +++ b/package/bpftool/bpftool.hash
> @@ -1,5 +1,5 @@
> # Locally calculated
> -sha256 f8f8cabc001823d270898ea3a635d1eb88e067bc24eed06f74e58d2650b32312 bpftool-v6.8.0-br1.tar.gz
> +sha256 465a50fea4afbacd326f2209d81ae0dcff637fbb2c9d1a315e94f79a788ce960 bpftool-v7.0.0-br1.tar.gz
> sha256 7c588754d5e81e92e2a12e47cf78949d485c9c22b4850f12d21b3835c85947d1 LICENSE
> sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause
> sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2.0
> diff --git a/package/bpftool/bpftool.mk b/package/bpftool/bpftool.mk
> index bb1e4ccdff..3b27698130 100644
> --- a/package/bpftool/bpftool.mk
> +++ b/package/bpftool/bpftool.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -BPFTOOL_VERSION = v6.8.0
> +BPFTOOL_VERSION = v7.0.0
> BPFTOOL_SITE = https://github.com/libbpf/bpftool
> BPFTOOL_SITE_METHOD = git
> BPFTOOL_GIT_SUBMODULES = YES
> --
> 2.34.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
prev parent reply other threads:[~2022-10-01 16:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-29 23:44 [Buildroot] [PATCH 1/1] package/bpftool: bump to version 7.0.0 James Hilliard
2022-10-01 16:47 ` Yann E. MORIN [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221001164732.GI30794@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@buildroot.org \
--cc=james.hilliard1@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.