* see: https://lists.openembedded.org/g/openembedded-architecture/message/2007 and https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327
* the files are now unpacked in different directory and paths in patches no longer match. * WIP started by me and finished by Theodore, thank you! * fixes: http://errors.yoctoproject.org/Errors/Details/772681/ Signed-off-by: Theodore A. Roth <[email protected]> Signed-off-by: Martin Jansa <[email protected]> --- ...spect-GOBUILDFLAGS-for-runc-and-remove-re.patch | 6 +++--- .../0001-runc-Add-console-socket-dev-null.patch | 4 ++-- .../0001-runc-docker-SIGUSR1-daemonize.patch | 8 ++++---- recipes-containers/runc/runc-docker_git.bb | 8 ++++---- recipes-containers/runc/runc-opencontainers_git.bb | 4 ++-- recipes-containers/runc/runc.inc | 14 +++++++------- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch index 9e5a8313..30332114 100644 --- a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch +++ b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch @@ -13,10 +13,10 @@ Signed-off-by: Bruce Ashfield <[email protected]> Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -Index: git/src/import/Makefile +Index: Makefile =================================================================== ---- git.orig/src/import/Makefile -+++ git/src/import/Makefile +--- a/Makefile ++++ b/Makefile @@ -24,7 +24,7 @@ GO_BUILDMODE := "-buildmode=pie" endif diff --git a/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch b/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch index cb0ddc37..91d56e7b 100644 --- a/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch +++ b/recipes-containers/runc/runc-docker/0001-runc-Add-console-socket-dev-null.patch @@ -16,8 +16,8 @@ Signed-off-by: Jason Wessel <[email protected]> Index: git/src/import/utils_linux.go =================================================================== ---- git.orig/src/import/utils_linux.go -+++ git/src/import/utils_linux.go +--- a/utils_linux.go ++++ b/utils_linux.go @@ -267,6 +267,11 @@ } diff --git a/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch b/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch index d3d1134b..bcf0cb27 100644 --- a/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch +++ b/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch @@ -33,8 +33,8 @@ Signed-off-by: Jason Wessel <[email protected]> Index: git/src/import/signals.go =================================================================== ---- git.orig/src/import/signals.go -+++ git/src/import/signals.go +--- a/signals.go ++++ b/signals.go @@ -5,7 +5,9 @@ import ( "os" @@ -120,8 +120,8 @@ Index: git/src/import/signals.go _ = tty.resize() Index: git/src/import/utils_linux.go =================================================================== ---- git.orig/src/import/utils_linux.go -+++ git/src/import/utils_linux.go +--- a/utils_linux.go ++++ b/utils_linux.go @@ -345,7 +345,7 @@ if err != nil { r.terminate(process) diff --git a/recipes-containers/runc/runc-docker_git.bb b/recipes-containers/runc/runc-docker_git.bb index 8d078e85..21291c7e 100644 --- a/recipes-containers/runc/runc-docker_git.bb +++ b/recipes-containers/runc/runc-docker_git.bb @@ -3,10 +3,10 @@ include runc.inc # Note: this rev is before the required protocol field, update when all components # have been updated to match. SRCREV_runc-docker = "a9833ff391a71b30069a6c3f816db113379a4346" -SRC_URI = "git://github.com/opencontainers/runc;branch=release-1.1;name=runc-docker;protocol=https \ - file://0001-runc-Add-console-socket-dev-null.patch \ - file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \ - file://0001-runc-docker-SIGUSR1-daemonize.patch \ +SRC_URI = "git://github.com/opencontainers/runc;branch=release-1.1;name=runc-docker;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ + file://0001-runc-Add-console-socket-dev-null.patch;patchdir=${GO_SRCURI_DESTSUFFIX} \ + file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch;patchdir=${GO_SRCURI_DESTSUFFIX} \ + file://0001-runc-docker-SIGUSR1-daemonize.patch;patchdir=${GO_SRCURI_DESTSUFFIX} \ " RUNC_VERSION = "1.1.12" diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb index 188b8440..aba59ea1 100644 --- a/recipes-containers/runc/runc-opencontainers_git.bb +++ b/recipes-containers/runc/runc-opencontainers_git.bb @@ -2,8 +2,8 @@ include runc.inc SRCREV = "a9833ff391a71b30069a6c3f816db113379a4346" SRC_URI = " \ - git://github.com/opencontainers/runc;branch=release-1.1;protocol=https \ - file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \ + git://github.com/opencontainers/runc;branch=release-1.1;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ + file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch;patchdir=${GO_SRCURI_DESTSUFFIX} \ " RUNC_VERSION = "1.1.12" diff --git a/recipes-containers/runc/runc.inc b/recipes-containers/runc/runc.inc index c8e74273..3e7a9712 100644 --- a/recipes-containers/runc/runc.inc +++ b/recipes-containers/runc/runc.inc @@ -4,9 +4,9 @@ DESCRIPTION = "runc is a CLI tool for spawning and running containers according # Apache-2.0 for containerd LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=435b266b3899aa8a959f17d41c56def8" +LIC_FILES_CHKSUM = "file://${GO_SRCURI_DESTSUFFIX}/LICENSE;md5=435b266b3899aa8a959f17d41c56def8" -S = "${WORKDIR}/git" +S = "${UNPACKDIR}" PV = "${RUNC_VERSION}+git${SRCPV}" @@ -44,18 +44,18 @@ do_compile() { # Set GOPATH. See 'PACKAGERS.md'. Don't rely on # docker to download its dependencies but rather # use dependencies packaged independently. - cd ${S}/src/import + cd ${S}/${GO_SRCURI_DESTSUFFIX} rm -rf .gopath dname=`dirname "${LIBCONTAINER_PACKAGE}"` bname=`basename "${LIBCONTAINER_PACKAGE}"` mkdir -p .gopath/src/${dname} (cd .gopath/src/${dname}; ln -sf ../../../../../${bname} ${bname}) - export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go" + export GOPATH="${S}/${GO_SRCURI_DESTSUFFIX}/.gopath:${S}/${GO_SRCURI_DESTSUFFIX}/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go" # Fix up symlink for go-cross compiler - rm -f ${S}/src/import/vendor/src - ln -sf ./ ${S}/src/import/vendor/src + rm -f ${S}/${GO_SRCURI_DESTSUFFIX}/vendor/src + ln -sf ./ ${S}/${GO_SRCURI_DESTSUFFIX}/vendor/src # Pass the needed cflags/ldflags so that cgo # can find the needed headers files and libraries @@ -77,7 +77,7 @@ do_compile() { do_install() { mkdir -p ${D}/${bindir} - cp ${S}/src/import/runc ${D}/${bindir}/runc + cp ${S}/${GO_SRCURI_DESTSUFFIX}/runc ${D}/${bindir}/runc ln -sf runc ${D}/${bindir}/docker-runc } -- 2.45.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8747): https://lists.yoctoproject.org/g/meta-virtualization/message/8747 Mute This Topic: https://lists.yoctoproject.org/mt/106277145/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
