|
Re: Issues with k3s runtime on master
Diego Sueiro
From:
Bruce Ashfield <bruce.ashfield@...>
On Fri, Apr 8, 2022 at 1:04 PM Bruce Ashfield via lists.yoctoproject.org <bruce.ashfield=gmail.com@...> wrote:
FYI: Here's the WIP change: https://git.yoctoproject.org/meta-virtualization/commit/?h=master-next&id=589391db2777f844577a3805fa475515fe62c99f
I can confirm that the k3s runtime is working with this change. Should we have SRCREV_FORMAT = "cni_plugins_flannel_plugin" as well as adding ;protocol=https into the SRC_URI?
Bruce
-- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
|
|
|
|
Re: [PATCH] k3s: do not use a go file as patch
Bruce Ashfield
On Fri, Apr 8, 2022 at 1:31 PM Adrian Freihofer <adrian.freihofer@...> wrote: Hi Bruce I'll see if I see the same behaviour, as i've done a LOT of cleanalls as I battled the uprev of k3s, and didn't see that. But it could have been hidden in a fail -> restart cycle as things moved past the issue.
Indeed, I suppose something could be done to allow that repo to have that name, and not be picked up as a patch, but it isn't a common problem, so the complexity wouldn't really be worth it. Once i've reproduced the issue, i'll test with your patch, as it is the simplest way to avoid the problem. Bruce
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
|
|
|
|
Re: Issues with k3s runtime on master
Bruce Ashfield
On Fri, Apr 8, 2022 at 1:04 PM Bruce Ashfield via lists.yoctoproject.org <bruce.ashfield=gmail.com@...> wrote:
FYI: Here's the WIP change: https://git.yoctoproject.org/meta-virtualization/commit/?h=master-next&id=589391db2777f844577a3805fa475515fe62c99f Bruce
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
|
|
|
|
Re: [PATCH] k3s: do not use a go file as patch
Adrian Freihofer
Hi Bruce
toggle quoted messageShow quoted text
Build with empty download folder works: bitbake k3s -c cleanall (cd downloads; find -name \*andreyvit\* -delete ) bitbake k3s My download folder looks like that after building K3S downloads]$ find -name \*andreyvit\* ./git2/github.com.andreyvit.diff ./git2/github.com.andreyvit.diff.done ./gitshallow_github.com.andreyvit.diff_c7f18ee-1.tar.gz ./gitshallow_github.com.andreyvit.diff_c7f18ee-1.tar.gz.done This does not work: bitbake k3s -c cleanall downloads]$ find -name \*andreyvit\* ./gitshallow_github.com.andreyvit.diff_c7f18ee-1.tar.gz ./gitshallow_github.com.andreyvit.diff_c7f18ee-1.tar.gz.done bitbake k3s ERROR: k3s-v1.22.6+k3s1+git4262c6b91a43ef8411870f72ff8b8715949f90e2- r0 do_patch: Importing patch 'github.com.andreyvit.diff' with striplevel '1' FileNotFoundError(2, 'No such file or directory') Conclusion: After bitbake k3s -c cleanall the error occurs. I also spent some time to analyze what the function "patch_path" in patch.py does: It matches ".diff" against "github.com.andreyvit.diff". Regards, Adrian
On Fri, 2022-04-08 at 10:29 -0400, Bruce Ashfield wrote:
|
|
|
|
Re: Issues with k3s runtime on master
Bruce Ashfield
On Fri, Apr 8, 2022 at 12:54 PM Diego Sueiro <Diego.Sueiro@...> wrote:
Yep. I don't use flannel, so it wasn't something that I had done. That being said, I wanted to avoid maintaining separate recipes per-plugin, so when the need arose, I was going to add it to cni_git as an entry on the SRC_URI. I can have a go at doing that, now that I know there is a need. Bruce - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
|
|
|
|
Issues with k3s runtime on master
Diego Sueiro
Hi Bruce,
I'm having k3s runtime issues where during the k3s.service start I'm getting error messages about missing
/usr/libexec/cni/flannel.
I saw that the cni_git.bb recipe was bumped to versions where flannel and its plugin are not available anymore.
In this case, should we have a recipe to provide both flannel and its plugin?
|
|
|
|
Re: [PATCH] k3s: do not use a go file as patch
Bruce Ashfield
On Fri, Apr 8, 2022 at 8:53 AM Bruce Ashfield via lists.yoctoproject.org <bruce.ashfield=gmail.com@...> wrote:
I am seeing a different fetch issue on a new/fresh machine I brought up this morning, using the -tip of master for all layers. My cached downloads were keeping it working on my other machines. I'll get past that issue and see if I get the patch issue. Cheers, Bruce
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
|
|
|
|
Re: [PATCH] k3s: do not use a go file as patch
Bruce Ashfield
On Fri, Apr 8, 2022 at 8:34 AM Adrian Freihofer <adrian.freihofer@...> wrote: Compiling k3s failed with: I've built this K3S hundreds of times, and have never seen this, so I won't apply this until I figure out what is the difference between your environment and mine. Can you share more details about your build environment, etc. Not sure how you create this huge SRC_URI list. Probably it would be the Eh, no. I'm not going to append that to all the URIs just because of one outlier that matched. Bruce Signed-off-by: Adrian Freihofer <adrian.freihofer@...> - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
|
|
|
|
[PATCH] k3s: do not use a go file as patch
Adrian Freihofer
Compiling k3s failed with:
do_patch: Importing patch 'github.com.andreyvit.diff' with striplevel '1' The problem is that github.com/andreyvit/diff ends up as github.com.andreyvit.diff in the download folder which than matches the test in patch.py. Not sure how you create this huge SRC_URI list. Probably it would be the best to add the apply=no to all urls. Signed-off-by: Adrian Freihofer <adrian.freihofer@...> --- recipes-containers/k3s/k3s_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-containers/k3s/k3s_git.bb index e2a3ffc..53a8677 100644 --- a/recipes-containers/k3s/k3s_git.bb +++ b/recipes-containers/k3s/k3s_git.bb @@ -219,7 +219,7 @@ SRC_URI += "git://github.com/alexflint/go-filemutex;name=go-filemutex;protocol=h # github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 # [1] git ls-remote https://github.com/andreyvit/diff c7f18ee00883bfd3b00e0a2bf7607827e0148ad4 SRCREV_diff="c7f18ee00883bfd3b00e0a2bf7607827e0148ad4" -SRC_URI += "git://github.com/andreyvit/diff;name=diff;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/andreyvit/diff" +SRC_URI += "git://github.com/andreyvit/diff;name=diff;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/andreyvit/diff;apply=no" # github.com/andybalholm/cascadia v1.0.0 # [1] git ls-remote https://github.com/andybalholm/cascadia 901648c87902174f774fac311d7f176f8647bdaa -- 2.35.1
|
|
|
|
[PATCH 3/3] xen: Remove 4.14 recipes and related patches
Michal Orzel
We shall only have recipes for the last two stable releases, thus
get rid of the 4.14 recipes and the corresponding patches. Signed-off-by: Michal Orzel <michal.orzel@...> --- ...-stand-alone-set-of-headers-Xen-4.14.patch | 178 ------------------ ...ython-pygrub-pass-DISTUTILS-xen-4.14.patch | 66 ------- ...d-firmware-as-ffreestanding-Xen-4.14.patch | 83 -------- recipes-extended/xen/xen-tools_4.14.bb | 21 --- recipes-extended/xen/xen_4.14.bb | 19 -- 5 files changed, 367 deletions(-) delete mode 100644 recipes-extended/xen/files/0001-firmware-provide-a-stand-alone-set-of-headers-Xen-4.14.patch delete mode 100644 recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch delete mode 100644 recipes-extended/xen/files/0001-tools-firmware-Build-firmware-as-ffreestanding-Xen-4.14.patch delete mode 100644 recipes-extended/xen/xen-tools_4.14.bb delete mode 100644 recipes-extended/xen/xen_4.14.bb diff --git a/recipes-extended/xen/files/0001-firmware-provide-a-stand-alone-set-of-headers-Xen-4.14.patch b/recipes-extended/xen/files/0001-firmware-provide-a-stand-alone-set-of-headers-Xen-4.14.patch deleted file mode 100644 index 7b062b7..0000000 --- a/recipes-extended/xen/files/0001-firmware-provide-a-stand-alone-set-of-headers-Xen-4.14.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 73b13705af7c3bb8fdf11932eb68788d090a443f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau@...> -Date: Thu, 4 Mar 2021 16:49:00 +0100 -Subject: [PATCH] firmware: provide a stand alone set of headers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The current build of the firmware relies on having 32bit compatible -headers installed in order to build some of the 32bit firmware. -Usually this can be solved by using the -ffreestanding compiler option -which drops the usage of the system headers in favor of a private set -of freestanding headers provided by the compiler itself that are not -tied to libc. - -However such option is broken at least in the gcc compiler provided in -Alpine Linux, as the system include path (ie: /usr/include) takes -precedence over the gcc private include path: - -#include <...> search starts here: - /usr/include - /usr/lib/gcc/x86_64-alpine-linux-musl/10.2.1/include - -And the headers in /usr/include are exclusively 64bit. - -Since -ffreestanding is currently broken on at least that distro, and -for resilience against future compilers also having the option broken -provide a set of stand alone 32bit headers required for the firmware -build. - -Signed-off-by: Roger Pau Monné <roger.pau@...> -Reviewed-by: Jan Beulich <jbeulich@...> -Release-Acked-by: Ian Jackson <iwj@...> -Applied to Xen 4.14 by: Christopher Clark <christopher.w.clark@...> ---- - tools/firmware/Rules.mk | 13 +++++++ - tools/firmware/include/stdarg.h | 10 +++++ - tools/firmware/include/stdbool.h | 9 +++++ - tools/firmware/include/stddef.h | 10 +++++ - tools/firmware/include/stdint.h | 39 +++++++++++++++++++ - tools/firmware/rombios/32bit/rombios_compat.h | 4 +- - 6 files changed, 82 insertions(+), 3 deletions(-) - create mode 100644 tools/firmware/include/stdarg.h - create mode 100644 tools/firmware/include/stdbool.h - create mode 100644 tools/firmware/include/stddef.h - create mode 100644 tools/firmware/include/stdint.h - -diff --git a/tools/firmware/include/stdarg.h b/tools/firmware/include/stdarg.h -new file mode 100644 -index 0000000000..c5e3761cd2 ---- /dev/null -+++ b/tools/firmware/include/stdarg.h -@@ -0,0 +1,10 @@ -+#ifndef _STDARG_H_ -+#define _STDARG_H_ -+ -+typedef __builtin_va_list va_list; -+#define va_copy(dest, src) __builtin_va_copy(dest, src) -+#define va_start(ap, last) __builtin_va_start(ap, last) -+#define va_end(ap) __builtin_va_end(ap) -+#define va_arg __builtin_va_arg -+ -+#endif -diff --git a/tools/firmware/include/stdbool.h b/tools/firmware/include/stdbool.h -new file mode 100644 -index 0000000000..0cf76b106c ---- /dev/null -+++ b/tools/firmware/include/stdbool.h -@@ -0,0 +1,9 @@ -+#ifndef _STDBOOL_H_ -+#define _STDBOOL_H_ -+ -+#define bool _Bool -+#define true 1 -+#define false 0 -+#define __bool_true_false_are_defined 1 -+ -+#endif -diff --git a/tools/firmware/include/stddef.h b/tools/firmware/include/stddef.h -new file mode 100644 -index 0000000000..c7f974608a ---- /dev/null -+++ b/tools/firmware/include/stddef.h -@@ -0,0 +1,10 @@ -+#ifndef _STDDEF_H_ -+#define _STDDEF_H_ -+ -+typedef __SIZE_TYPE__ size_t; -+ -+#define NULL ((void*)0) -+ -+#define offsetof(t, m) __builtin_offsetof(t, m) -+ -+#endif -diff --git a/tools/firmware/include/stdint.h b/tools/firmware/include/stdint.h -new file mode 100644 -index 0000000000..16a0b6de19 ---- /dev/null -+++ b/tools/firmware/include/stdint.h -@@ -0,0 +1,39 @@ -+#ifndef _STDINT_H_ -+#define _STDINT_H_ -+ -+#if defined(__LP64__) || defined(__P64__) -+#error "32bit only header" -+#endif -+ -+typedef unsigned char uint8_t; -+typedef signed char int8_t; -+ -+typedef unsigned short uint16_t; -+typedef signed short int16_t; -+ -+typedef unsigned int uint32_t; -+typedef signed int int32_t; -+ -+typedef unsigned long long uint64_t; -+typedef signed long long int64_t; -+ -+#define INT8_MIN (-0x7f-1) -+#define INT16_MIN (-0x7fff-1) -+#define INT32_MIN (-0x7fffffff-1) -+#define INT64_MIN (-0x7fffffffffffffffll-1) -+ -+#define INT8_MAX 0x7f -+#define INT16_MAX 0x7fff -+#define INT32_MAX 0x7fffffff -+#define INT64_MAX 0x7fffffffffffffffll -+ -+#define UINT8_MAX 0xff -+#define UINT16_MAX 0xffff -+#define UINT32_MAX 0xffffffffu -+#define UINT64_MAX 0xffffffffffffffffull -+ -+typedef uint32_t uintptr_t; -+ -+#define UINTPTR_MAX UINT32_MAX -+ -+#endif -diff --git a/tools/firmware/rombios/32bit/rombios_compat.h b/tools/firmware/rombios/32bit/rombios_compat.h -index 3fe7d67721..8ba4c17ffd 100644 ---- a/tools/firmware/rombios/32bit/rombios_compat.h -+++ b/tools/firmware/rombios/32bit/rombios_compat.h -@@ -8,9 +8,7 @@ - - #define ADDR_FROM_SEG_OFF(seg, off) (void *)((((uint32_t)(seg)) << 4) + (off)) - --typedef unsigned char uint8_t; --typedef unsigned short int uint16_t; --typedef unsigned int uint32_t; -+#include <stdint.h> - - typedef uint8_t Bit8u; - typedef uint16_t Bit16u; -diff --git a/tools/firmware/Rules.mk b/tools/firmware/Rules.mk -index 26bbddccd4..cb388b7011 100644 ---- a/tools/firmware/Rules.mk -+++ b/tools/firmware/Rules.mk -@@ -17,3 +17,16 @@ $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) - - # Extra CFLAGS suitable for an embedded type of environment. - CFLAGS += -fno-builtin -msoft-float -+ -+# Use our own set of stand alone headers to build firmware. -+# -+# Ideally using -ffreestanding should be enough, but that relies on the -+# compiler having the right order for include paths (ie: compiler private -+# headers before system ones) or the libc headers having proper arch-agnostic -+# freestanding support. This is not the case in Alpine at least which searches -+# system headers before compiler ones and has arch-specific libc headers. This -+# has been reported upstream: -+# https://gitlab.alpinelinux.org/alpine/aports/-/issues/12477 -+# In the meantime (and for resilience against broken systems) use our own set -+# of headers that provide what's needed for the firmware build. -+CFLAGS += -nostdinc -I$(XEN_ROOT)/tools/firmware/include --- -2.25.1 - diff --git a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch deleted file mode 100644 index f0688fd..0000000 --- a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch +++ /dev/null @@ -1,66 +0,0 @@ -From d79dcc2002008c58683de82f06c168d6eea57991 Mon Sep 17 00:00:00 2001 -From: Maciej Pijanowski <maciej.pijanowski@...> -Date: Fri, 19 Oct 2018 11:01:37 +0200 -Subject: [PATCH] python,pygrub: pass DISTUTILS env vars as setup.py args - -Allow to respect the target install dir (PYTHON_SITEPACKAGES_DIR) -as well as other parameters set by the OpenEmbedded build system. -This is especially useful when the target libdir is not the default one -(/usr/lib), but for example /usr/lib64. - -Signed-off-by: Maciej Pijanowski <maciej.pijanowski@...> - -Forward-ported to Xen 4.12.0 -Signed-off-by: Christopher Clark <christopher.clark6@...> - -Modified to support pygrub installation with python 3 -Signed-off-by: Christopher Clark <christopher.clark6@...> - -Forward-ported to Xen 4.14.0 -Signed-off-by: Christopher Clark <christopher.clark6@...> -diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile -index 3063c49..513314b 100644 ---- a/tools/pygrub/Makefile -+++ b/tools/pygrub/Makefile -@@ -10,14 +10,17 @@ INSTALL_LOG = build/installed_files.txt - all: build - .PHONY: build - build: -- CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build -+ CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build $(DISTUTILS_BUILD_ARGS) - - .PHONY: install - install: all - $(INSTALL_DIR) $(DESTDIR)/$(bindir) - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) \ - setup.py install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ -- --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force -+ --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force \ -+ $(DISTUTILS_INSTALL_ARGS) -+ rm -f $(DESTDIR)/$(LIBEXEC_BIN)/pygrub -+ $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub - set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \ - "`readlink -f $(DESTDIR)/$(bindir)`" != \ - "`readlink -f $(LIBEXEC_BIN)`" ]; then \ -diff --git a/tools/python/Makefile b/tools/python/Makefile -index 541858e..4d4a344 100644 ---- a/tools/python/Makefile -+++ b/tools/python/Makefile -@@ -10,7 +10,7 @@ INSTALL_LOG = build/installed_files.txt - - .PHONY: build - build: -- CC="$(CC)" CFLAGS="$(PY_CFLAGS)" $(PYTHON) setup.py build -+ CC="$(CC)" CFLAGS="$(PY_CFLAGS)" $(PYTHON) setup.py build $(DISTUTILS_BUILD_ARGS) - - .PHONY: install - install: -@@ -18,7 +18,7 @@ install: - - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) \ - setup.py install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ -- --root="$(DESTDIR)" --force -+ --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS) - - $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN) diff --git a/recipes-extended/xen/files/0001-tools-firmware-Build-firmware-as-ffreestanding-Xen-4.14.patch b/recipes-extended/xen/files/0001-tools-firmware-Build-firmware-as-ffreestanding-Xen-4.14.patch deleted file mode 100644 index 001b196..0000000 --- a/recipes-extended/xen/files/0001-tools-firmware-Build-firmware-as-ffreestanding-Xen-4.14.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 0eae016b6e3dce69e3fb86aca5c4f221591a2f12 Mon Sep 17 00:00:00 2001 -From: Andrew Cooper <andrew.cooper3@...> -Date: Thu, 25 Feb 2021 19:15:08 +0000 -Subject: [PATCH] tools/firmware: Build firmware as -ffreestanding - -firmware should always have been -ffreestanding, as it doesn't execute in the -host environment. -ffreestanding implies -fno-builtin, so replace the option. - -inttypes.h isn't a freestanding header, but the 32bitbios_support.c only wants -the stdint.h types so switch to the more appropriate include. - -This removes the build time dependency on a 32bit libc just to compile the -hvmloader and friends. - -Update README and the TravisCI configuration. - -Signed-off-by: Andrew Cooper <andrew.cooper3@...> -Reviewed-by: Jan Beulich <jbeulich@...> -Reviewed-by: Ian Jackson <iwj@...> -Release-Acked-by: Ian Jackson <iwj@...> -Applied to m-v Xen 4.14 series: Christopher Clark <christopher.w.clark@...> ---- - .travis.yml | 1 - - README | 3 --- - tools/firmware/Rules.mk | 2 +- - tools/firmware/hvmloader/32bitbios_support.c | 2 +- - 4 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/.travis.yml b/.travis.yml -index 15ca9e9047..2362475f7a 100644 ---- a/.travis.yml -+++ b/.travis.yml -@@ -58,7 +58,6 @@ addons: - - acpica-tools - - bin86 - - bcc -- - libc6-dev-i386 - - libnl-3-dev - - ocaml-nox - - libfindlib-ocaml-dev -diff --git a/README b/README -index 6e15242ae1..8c99c30986 100644 ---- a/README -+++ b/README -@@ -62,9 +62,6 @@ provided by your OS distributor: - * GNU bison and GNU flex - * GNU gettext - * ACPI ASL compiler (iasl) -- * Libc multiarch package (e.g. libc6-dev-i386 / glibc-devel.i686). -- Required when building on a 64-bit platform to build -- 32-bit components which are enabled on a default build. - - In addition to the above there are a number of optional build - prerequisites. Omitting these will cause the related features to be -diff --git a/tools/firmware/Rules.mk b/tools/firmware/Rules.mk -index cb388b7011..9f78a7dec9 100644 ---- a/tools/firmware/Rules.mk -+++ b/tools/firmware/Rules.mk -@@ -16,7 +16,7 @@ CFLAGS += -Werror - $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) - - # Extra CFLAGS suitable for an embedded type of environment. --CFLAGS += -fno-builtin -msoft-float -+CFLAGS += -ffreestanding -msoft-float - - # Use our own set of stand alone headers to build firmware. - # -diff --git a/tools/firmware/hvmloader/32bitbios_support.c b/tools/firmware/hvmloader/32bitbios_support.c -index 114135022e..ef681d4f57 100644 ---- a/tools/firmware/hvmloader/32bitbios_support.c -+++ b/tools/firmware/hvmloader/32bitbios_support.c -@@ -20,7 +20,7 @@ - * this program; If not, see <http://www.gnu.org/licenses/>. - */ - --#include <inttypes.h> -+#include <stdint.h> - #include <elf.h> - #ifdef __sun__ - #include <sys/machelf.h> --- -2.25.1 - diff --git a/recipes-extended/xen/xen-tools_4.14.bb b/recipes-extended/xen/xen-tools_4.14.bb deleted file mode 100644 index 9d78e44..0000000 --- a/recipes-extended/xen/xen-tools_4.14.bb +++ /dev/null @@ -1,21 +0,0 @@ -# 4.14.3 release SHA -SRCREV ?= "9f2b6c5ec2ded4c1caf149743e862c5f15d6d083" - -XEN_REL ?= "4.14" -XEN_BRANCH ?= "stable-${XEN_REL}" - -SRC_URI = " \ - git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ - file://0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch \ - file://0001-firmware-provide-a-stand-alone-set-of-headers-Xen-4.14.patch \ - file://0001-tools-firmware-Build-firmware-as-ffreestanding-Xen-4.14.patch \ - " - -LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5" - -PV = "${XEN_REL}+stable${SRCPV}" - -S = "${WORKDIR}/git" - -require xen.inc -require xen-tools.inc diff --git a/recipes-extended/xen/xen_4.14.bb b/recipes-extended/xen/xen_4.14.bb deleted file mode 100644 index 267db16..0000000 --- a/recipes-extended/xen/xen_4.14.bb +++ /dev/null @@ -1,19 +0,0 @@ -# 4.14.3 release SHA -SRCREV ?= "9f2b6c5ec2ded4c1caf149743e862c5f15d6d083" - -XEN_REL ?= "4.14" -XEN_BRANCH ?= "stable-${XEN_REL}" - -SRC_URI = " \ - git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ - file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \ - " - -LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5" - -PV = "${XEN_REL}+stable${SRCPV}" - -S = "${WORKDIR}/git" - -require xen.inc -require xen-hypervisor.inc -- 2.25.1
|
|
|
|
[PATCH 2/3] xen: Add recipes for stable Xen 4.16 release and update master
Michal Orzel
Add recipes for Xen 4.16 release as, according to the documentation
we shall have recipes for the latest stable major version of Xen before the next Yocto release. Bump PREFERED_VERSION to 4.16 as well. Take the opportunity to update SRCREV of xen recipes for master and bump XEN_REL version to 4.17 as this is the current development version. Signed-off-by: Michal Orzel <michal.orzel@...> --- .../include/meta-virt-default-versions.inc | 4 ++-- recipes-extended/xen/xen-tools_4.16.bb | 19 +++++++++++++++++++ recipes-extended/xen/xen-tools_git.bb | 6 +++--- recipes-extended/xen/xen_4.16.bb | 19 +++++++++++++++++++ recipes-extended/xen/xen_git.bb | 6 +++--- 5 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 recipes-extended/xen/xen-tools_4.16.bb create mode 100644 recipes-extended/xen/xen_4.16.bb diff --git a/conf/distro/include/meta-virt-default-versions.inc b/conf/di= stro/include/meta-virt-default-versions.inc index 8a2db70..b2ce021 100644 --- a/conf/distro/include/meta-virt-default-versions.inc +++ b/conf/distro/include/meta-virt-default-versions.inc @@ -1,4 +1,4 @@ # Meta-virtuailization PREFERED_VERSION =20 -PREFERRED_VERSION_xen ?=3D "4.15+stable%" -PREFERRED_VERSION_xen-tools ?=3D "4.15+stable%" +PREFERRED_VERSION_xen ?=3D "4.16+stable%" +PREFERRED_VERSION_xen-tools ?=3D "4.16+stable%" diff --git a/recipes-extended/xen/xen-tools_4.16.bb b/recipes-extended/xe= n/xen-tools_4.16.bb new file mode 100644 index 0000000..4a07874 --- /dev/null +++ b/recipes-extended/xen/xen-tools_4.16.bb @@ -0,0 +1,19 @@ +# xen 4.16.0 release sha +SRCREV ?=3D "b0b4661fa3cba995e433b94ea569c90f65a3e5fc" + +XEN_REL ?=3D "4.16" +XEN_BRANCH ?=3D "stable-${XEN_REL}" + +SRC_URI =3D " \ + git://xenbits.xen.org/xen.git;branch=3D${XEN_BRANCH} \ + file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \ + " + +LIC_FILES_CHKSUM ?=3D "file://COPYING;md5=3D419739e325a50f3d7b4501338e44= a4e5" + +PV =3D "${XEN_REL}+stable${SRCPV}" + +S =3D "${WORKDIR}/git" + +require xen.inc +require xen-tools.inc diff --git a/recipes-extended/xen/xen-tools_git.bb b/recipes-extended/xen= /xen-tools_git.bb index e733f1d..a450a7d 100644 --- a/recipes-extended/xen/xen-tools_git.bb +++ b/recipes-extended/xen/xen-tools_git.bb @@ -1,7 +1,7 @@ -# master status on 2022-03-08 -SRCREV ?=3D "9d4a44380d273de22d5753883cbf5581795ff24d" +# master status on 2022-04-05 +SRCREV ?=3D "14dd241aad8af447680ac73e8579990e2c09c1e7" =20 -XEN_REL ?=3D "4.16" +XEN_REL ?=3D "4.17" XEN_BRANCH ?=3D "master" =20 SRC_URI =3D " \ diff --git a/recipes-extended/xen/xen_4.16.bb b/recipes-extended/xen/xen_= 4.16.bb new file mode 100644 index 0000000..be54d11 --- /dev/null +++ b/recipes-extended/xen/xen_4.16.bb @@ -0,0 +1,19 @@ +# xen 4.16.0 release sha +SRCREV ?=3D "b0b4661fa3cba995e433b94ea569c90f65a3e5fc" + +XEN_REL ?=3D "4.16" +XEN_BRANCH ?=3D "stable-${XEN_REL}" + +SRC_URI =3D " \ + git://xenbits.xen.org/xen.git;branch=3D${XEN_BRANCH} \ + file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-loca= tion.patch \ + " + +LIC_FILES_CHKSUM ?=3D "file://COPYING;md5=3D419739e325a50f3d7b4501338e44= a4e5" + +PV =3D "${XEN_REL}+stable${SRCPV}" + +S =3D "${WORKDIR}/git" + +require xen.inc +require xen-hypervisor.inc diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_g= it.bb index 2fbfb54..ebd1b76 100644 --- a/recipes-extended/xen/xen_git.bb +++ b/recipes-extended/xen/xen_git.bb @@ -1,7 +1,7 @@ -# master status on 2022-03-08 -SRCREV ?=3D "9d4a44380d273de22d5753883cbf5581795ff24d" +# master status on 2022-04-05 +SRCREV ?=3D "14dd241aad8af447680ac73e8579990e2c09c1e7" =20 -XEN_REL ?=3D "4.16" +XEN_REL ?=3D "4.17" XEN_BRANCH ?=3D "master" =20 SRC_URI =3D " \ --=20 2.25.1
|
|
|
|
[PATCH 1/3] xen: Bump SRCREV of 4.15 recipes to 4.15.2
Michal Orzel
Bump SRCREV version of xen recipes to use the latest 4.15 release
which is 4.15.2. Signed-off-by: Michal Orzel <michal.orzel@...> --- recipes-extended/xen/xen-tools_4.15.bb | 4 ++-- recipes-extended/xen/xen_4.15.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-extended/xen/xen-tools_4.15.bb b/recipes-extended/xe= n/xen-tools_4.15.bb index 840f162..5592dd7 100644 --- a/recipes-extended/xen/xen-tools_4.15.bb +++ b/recipes-extended/xen/xen-tools_4.15.bb @@ -1,5 +1,5 @@ -# xen 4.15.1 release sha -SRCREV ?=3D "84fa99099b920f7bcde8899e1a9b756078719d7d" +# xen 4.15.2 release sha +SRCREV ?=3D "32dcef072fb37d432fd45c7916383472f3fcbc5e" =20 XEN_REL ?=3D "4.15" XEN_BRANCH ?=3D "stable-${XEN_REL}" diff --git a/recipes-extended/xen/xen_4.15.bb b/recipes-extended/xen/xen_= 4.15.bb index 1b87ae8..41023b2 100644 --- a/recipes-extended/xen/xen_4.15.bb +++ b/recipes-extended/xen/xen_4.15.bb @@ -1,5 +1,5 @@ -# xen 4.15.1 release sha -SRCREV ?=3D "84fa99099b920f7bcde8899e1a9b756078719d7d" +# xen 4.15.2 release sha +SRCREV ?=3D "32dcef072fb37d432fd45c7916383472f3fcbc5e" =20 XEN_REL ?=3D "4.15" XEN_BRANCH ?=3D "stable-${XEN_REL}" --=20 2.25.1
|
|
|
|
[PATCH 0/3] xen: Update recipes for xen and xen-tools
Michal Orzel
Before the next Yocto release, Xen recipes need to be updated.
This patch series: - updates 4.15 recipes - introduces 4.16 recipes - removes 4.14 recipes Michal Orzel (3): xen: Bump SRCREV of 4.15 recipes to 4.15.2 xen: Add recipes for stable Xen 4.16 release and update master xen: Remove 4.14 recipes and related patches .../include/meta-virt-default-versions.inc | 4 +- ...-stand-alone-set-of-headers-Xen-4.14.patch | 178 ------------------ ...ython-pygrub-pass-DISTUTILS-xen-4.14.patch | 66 ------- ...d-firmware-as-ffreestanding-Xen-4.14.patch | 83 -------- recipes-extended/xen/xen-tools_4.14.bb | 21 --- recipes-extended/xen/xen-tools_4.15.bb | 4 +- recipes-extended/xen/xen-tools_4.16.bb | 19 ++ recipes-extended/xen/xen-tools_git.bb | 6 +- recipes-extended/xen/xen_4.15.bb | 4 +- .../xen/{xen_4.14.bb =3D> xen_4.16.bb} | 6 +- recipes-extended/xen/xen_git.bb | 6 +- 11 files changed, 34 insertions(+), 363 deletions(-) delete mode 100644 recipes-extended/xen/files/0001-firmware-provide-a-st= and-alone-set-of-headers-Xen-4.14.patch delete mode 100644 recipes-extended/xen/files/0001-python-pygrub-pass-DI= STUTILS-xen-4.14.patch delete mode 100644 recipes-extended/xen/files/0001-tools-firmware-Build-= firmware-as-ffreestanding-Xen-4.14.patch delete mode 100644 recipes-extended/xen/xen-tools_4.14.bb create mode 100644 recipes-extended/xen/xen-tools_4.16.bb rename recipes-extended/xen/{xen_4.14.bb =3D> xen_4.16.bb} (79%) --=20 2.25.1
|
|
|
|
Re: [PATCH] virt-what: add new recipe
Bruce Ashfield
merged to master.
toggle quoted messageShow quoted text
Bruce In message: [meta-virtualization] [PATCH] virt-what: add new recipe on 06/04/2022 Ross Burton wrote:
Signed-off-by: Ross Burton <ross.burton@...>
|
|
|
|
Re: [PATCH] virt-what: add new recipe
Ross Burton <ross@...>
It pokes at /proc, /sys, and cpuid, so it should be initsystem agnostic.
toggle quoted messageShow quoted text
Ross
On Wed, 6 Apr 2022 at 17:45, Bruce Ashfield <bruce.ashfield@...> wrote:
|
|
|
|
Re: [PATCH] virt-what: add new recipe
Bruce Ashfield
I've always used systemd-detect-virt for this same use case.
toggle quoted messageShow quoted text
Can you confirm if it works both on sysvinit and systemd based init setups ? Bruce In message: [meta-virtualization] [PATCH] virt-what: add new recipe on 06/04/2022 Ross Burton wrote:
Signed-off-by: Ross Burton <ross.burton@...>
|
|
|
|
Re: [dunfell][PATCH] containerd-opencontainers: add EXTRA_EXTLDFLAGS and use it to fix build with gold
Bruce Ashfield
Sorry for the delay, this is now merged to dunfell.
toggle quoted messageShow quoted text
Bruce In message: [meta-virtualization][dunfell][PATCH] containerd-opencontainers: add EXTRA_EXTLDFLAGS and use it to fix build with gold on 01/04/2022 Martin Jansa wrote:
* Work around internal error in gold triggered due to DWARF-5 by forcing to use bfd even with ld-is-gold:
|
|
|
|
[PATCH] virt-what: add new recipe
Ross Burton <ross@...>
Signed-off-by: Ross Burton <ross.burton@...>
--- recipes-extended/virt-what/virt-what_1.21.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 recipes-extended/virt-what/virt-what_1.21.bb diff --git a/recipes-extended/virt-what/virt-what_1.21.bb b/recipes-exten= ded/virt-what/virt-what_1.21.bb new file mode 100644 index 0000000..aa235b3 --- /dev/null +++ b/recipes-extended/virt-what/virt-what_1.21.bb @@ -0,0 +1,11 @@ +SUMMARY =3D "Detect if we are running in a virtual machine" +HOMEPAGE =3D "https://people.redhat.com/~rjones/virt-what/" +LICENSE =3D "GPL-2.0-only" +LIC_FILES_CHKSUM =3D "file://COPYING;md5=3Db234ee4d69f5fce4486a80fdaf4a4= 263" + +SRC_URI =3D "https://people.redhat.com/~rjones/virt-what/files/${BP}.tar= .gz" +SRC_URI[sha256sum] =3D "12cb455334aa4cfd53ab78f27e2252e94d1f676dd093f483= 27ed94d8080d1f7b" + +DEPENDS =3D "perl-native" + +inherit autotools --=20 2.25.1
|
|
|
|
[dunfell][PATCH] containerd-opencontainers: add EXTRA_EXTLDFLAGS and use it to fix build with gold
Martin Jansa
* Work around internal error in gold triggered due to DWARF-5 by forcing to use bfd even with ld-is-gold:
_/OE/lge/build/webosose/dunfell/BUILD/work/qemux86_64-webos-linux/containerd-opencontainers/v1.2.14+gitAUTOINC+3b3e9d5f62-r0/git/src/import/cmd/containerd-shim /OE/lge/build/webosose/dunfell/BUILD/work/qemux86_64-webos-linux/containerd-opencontainers/v1.2.14+gitAUTOINC+3b3e9d5f62-r0/recipe-sysroot-native/usr/lib/x86_64-webos-linux/go/pkg/tool/linux_amd64/link: running x86_64-webos-linux-gcc failed: exit status 1 /OE/lge/build/webosose/dunfell/BUILD/work/qemux86_64-webos-linux/containerd-opencontainers/v1.2.14+gitAUTOINC+3b3e9d5f62-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/../../libexec/x86_64-webos-linux/gcc/x86_64-webos-linux/9.3.0/ld: internal error in read_header_prolog, at ../../gold/dwarf_reader.cc:1678 collect2: error: ld returned 1 exit status * alternatively we can backport DWARF-5 support to binutils-2.34 used in dunfell like in: https://git.openembedded.org/openembedded-core/commit/?id=d07d4d739ae17787017f771dd2068fda0e836722 Signed-off-by: Martin Jansa <Martin.Jansa@...> --- .../0001-Add-build-option-GODEBUG-1.patch | 2 +- .../0001-build-use-oe-provided-GO-and-flags.patch | 0 .../containerd/containerd-opencontainers_git.bb | 11 ++++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) rename recipes-containers/containerd/{files => containerd-opencontainers}/0001-build-use-oe-provided-GO-and-flags.patch (100%) diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-Add-build-option-GODEBUG-1.patch b/recipes-containers/containerd/containerd-opencontainers/0001-Add-build-option-GODEBUG-1.patch index 05c4f15..fec9ea6 100644 --- a/recipes-containers/containerd/containerd-opencontainers/0001-Add-build-option-GODEBUG-1.patch +++ b/recipes-containers/containerd/containerd-opencontainers/0001-Add-build-option-GODEBUG-1.patch @@ -33,7 +33,7 @@ index 4355395..4fb5d3b 100644 -GO_LDFLAGS=-ldflags '-s -w -X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) $(EXTRA_LDFLAGS)' -SHIM_GO_LDFLAGS=-ldflags '-s -w -X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) -extldflags "-static"' +GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) $(EXTRA_LDFLAGS)' -+SHIM_GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) -extldflags "-static" $(EXTRA_LDFLAGS)' ++SHIM_GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) -extldflags "-static $(EXTRA_EXTLDFLAGS)" $(EXTRA_LDFLAGS)' #Replaces ":" (*nix), ";" (windows) with newline for easy parsing GOPATHS=$(shell echo ${GOPATH} | tr ":" "\n" | tr ";" "\n") diff --git a/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch b/recipes-containers/containerd/containerd-opencontainers/0001-build-use-oe-provided-GO-and-flags.patch similarity index 100% rename from recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch rename to recipes-containers/containerd/containerd-opencontainers/0001-build-use-oe-provided-GO-and-flags.patch diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb index a52a5c3..5f697ed 100644 --- a/recipes-containers/containerd/containerd-opencontainers_git.bb +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb @@ -10,7 +10,16 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d CONTAINERD_VERSION = "v1.2.14" -EXTRA_OEMAKE += "GODEBUG=1" +# Work around internal error in gold triggered due to DWARF-5 by forcing to use bfd even with ld-is-gold: +# _/OE/lge/build/webosose/dunfell/BUILD/work/qemux86_64-webos-linux/containerd-opencontainers/v1.2.14+gitAUTOINC+3b3e9d5f62-r0/git/src/import/cmd/containerd-shim +# /OE/lge/build/webosose/dunfell/BUILD/work/qemux86_64-webos-linux/containerd-opencontainers/v1.2.14+gitAUTOINC+3b3e9d5f62-r0/recipe-sysroot-native/usr/lib/x86_64-webos-linux/go/pkg/tool/linux_amd64/link: running x86_64-webos-linux-gcc failed: exit status 1 +# /OE/lge/build/webosose/dunfell/BUILD/work/qemux86_64-webos-linux/containerd-opencontainers/v1.2.14+gitAUTOINC+3b3e9d5f62-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/../../libexec/x86_64-webos-linux/gcc/x86_64-webos-linux/9.3.0/ld: internal error in read_header_prolog, at ../../gold/dwarf_reader.cc:1678 +# collect2: error: ld returned 1 exit status +# alternatively we can backport DWARF-5 support to binutils-2.34 used in dunfell like in: +# https://git.openembedded.org/openembedded-core/commit/?id=d07d4d739ae17787017f771dd2068fda0e836722 +EXTRA_EXTLDFLAGS = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + +EXTRA_OEMAKE += "GODEBUG=1 EXTRA_EXTLDFLAGS='${EXTRA_EXTLDFLAGS}'" PROVIDES += "virtual/containerd" RPROVIDES_${PN} = "virtual/containerd" -- 2.35.1
|
|
|
|
Re: k3s build issues on master
Bruce Ashfield
On Thu, Mar 31, 2022 at 2:05 PM Diego Sueiro <Diego.Sueiro@...> wrote:
The SRCREV is as intended. It is not intended to be that tag exactly, it is the tip of the 1.22.x branch (and that's what all of them have been throughout the history of the recipes). We can use +git${SRCPV} in the recipe, but honestly, that's not the biggest challenge with the go mod chaos, but I'll add it as part of my next update. Cheers, Bruce
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
|
|
|