diff options
52 files changed, 191 insertions, 103 deletions
diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb index 7f6c75d9..2beeaf8f 100644 --- a/recipes-containers/containerd/containerd-opencontainers_git.bb +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb @@ -5,7 +5,7 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and support as well as checkpoint and restore for cloning and live migration of containers." -SRCREV = "7b11cfaabd73bb80907dd23182b9347b4245eb5d" +SRCREV = "9cc61520f4cd876b86e77edfeb88fbcd536d1f9d" SRC_URI = "git://github.com/containerd/containerd;branch=release/1.4 \ file://0001-build-use-oe-provided-GO-and-flags.patch \ file://0001-Add-build-option-GODEBUG-1.patch \ @@ -15,7 +15,8 @@ SRC_URI = "git://github.com/containerd/containerd;branch=release/1.4 \ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89" -CONTAINERD_VERSION = "v1.4.12" +CONTAINERD_VERSION = "v1.4.13" +CVE_VERSION = "1.4.13" EXTRA_OEMAKE += "GODEBUG=1" diff --git a/recipes-containers/go-digest/go-digest_git.bb b/recipes-containers/go-digest/go-digest_git.bb index a2f8cd69..e5317061 100644 --- a/recipes-containers/go-digest/go-digest_git.bb +++ b/recipes-containers/go-digest/go-digest_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE.code;md5=9cd86830b557232ce55e SRCNAME = "go-digest" PKG_NAME = "github.com/opencontainers/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME}" +SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https" SRCREV = "b6234c321f263c503268e3b205f3d9755f9d14ed" PV = "v1.0.0-rc0+git${SRCPV}" diff --git a/recipes-containers/go-errors/go-errors_git.bb b/recipes-containers/go-errors/go-errors_git.bb index 3bb74a7c..b25f74da 100644 --- a/recipes-containers/go-errors/go-errors_git.bb +++ b/recipes-containers/go-errors/go-errors_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=6fe682a02df52c6653f33bd0f SRCNAME = "errors" PKG_NAME = "github.com/pkg/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME}" +SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https" SRCREV = "248dadf4e9068a0b3e79f02ed0a610d935de5302" PV = "v0.8.0+git${SRCPV}" diff --git a/recipes-containers/go-spf13-cobra/spf13-cobra_git.bb b/recipes-containers/go-spf13-cobra/spf13-cobra_git.bb index e942e4e3..c18b531d 100644 --- a/recipes-containers/go-spf13-cobra/spf13-cobra_git.bb +++ b/recipes-containers/go-spf13-cobra/spf13-cobra_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE.txt;md5=920d76114a32b0fb75b3f SRCNAME = "cobra" PKG_NAME = "github.com/spf13/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME}" +SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https" SRCREV = "b5d8e8f46a2f829f755b6e33b454e25c61c935e1" PV = "v0.0.1+git${SRCPV}" diff --git a/recipes-containers/go-spf13-pflag/spf13-pflag_git.bb b/recipes-containers/go-spf13-pflag/spf13-pflag_git.bb index 2fbcb439..bb92140a 100644 --- a/recipes-containers/go-spf13-pflag/spf13-pflag_git.bb +++ b/recipes-containers/go-spf13-pflag/spf13-pflag_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=1e8b7dc8b906737639131047a SRCNAME = "pflag" PKG_NAME = "github.com/spf13/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME}" +SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https" SRCREV = "9ff6c6923cfffbcd502984b8e0c80539a94968b7" PV = "v1.0.0-rc4+git${SRCPV}" diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb index a083c5b9..08afa453 100644 --- a/recipes-containers/kubernetes/kubernetes_git.bb +++ b/recipes-containers/kubernetes/kubernetes_git.bb @@ -1,4 +1,4 @@ -HOMEPAGE = "git://github.com/kubernetes/kubernetes" +HOMEPAGE = "git://github.com/kubernetes/kubernetes;branch=master" SUMMARY = "Production-Grade Container Scheduling and Management" DESCRIPTION = "Kubernetes is an open source system for managing containerized \ applications across multiple hosts, providing basic mechanisms for deployment, \ diff --git a/recipes-containers/oci-image-tools/oci-image-tools_git.bb b/recipes-containers/oci-image-tools/oci-image-tools_git.bb index 799262cb..c5d451e7 100644 --- a/recipes-containers/oci-image-tools/oci-image-tools_git.bb +++ b/recipes-containers/oci-image-tools/oci-image-tools_git.bb @@ -12,7 +12,7 @@ DEPENDS = "\ spf13-pflag \ " -SRC_URI = "git://github.com/opencontainers/image-tools.git \ +SRC_URI = "git://github.com/opencontainers/image-tools.git;branch=master \ file://0001-config-make-Config.User-mapping-errors-a-warning.patch \ file://0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch" diff --git a/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb b/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb index c4083c09..4b5fb9cb 100644 --- a/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb +++ b/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=b355a61a394a504dacde901c9 SRCNAME = "runtime-spec" PKG_NAME = "github.com/opencontainers/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME}" +SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=main;protocol=https" SRCREV = "78ab98c0761136f84e6e21b24b4dcd0be68ab782" PV = "v1.0.1+git${SRCPV}" diff --git a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb index 7f194027..34ac2811 100644 --- a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb +++ b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb @@ -3,7 +3,7 @@ SUMMARY = "oci-runtime-tool is a collection of tools for working with the OCI ru LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=b355a61a394a504dacde901c958f662c" -SRC_URI = "git://github.com/opencontainers/runtime-tools.git \ +SRC_URI = "git://github.com/opencontainers/runtime-tools.git;branch=master \ file://0001-Revert-implement-add-set-function-for-hooks-items.patch \ file://0001-build-use-for-cross-compiler.patch \ " diff --git a/recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb b/recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb index 6734bffe..07a30b27 100644 --- a/recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb +++ b/recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb @@ -7,7 +7,7 @@ PRIORITY = "optional" DEPENDS = "yajl util-linux" SRCREV = "05e692346ca73e022754332a7da641230dae2ffe" -SRC_URI = "git://github.com/projectatomic/oci-systemd-hook \ +SRC_URI = "git://github.com/projectatomic/oci-systemd-hook;branch=master \ file://0001-selinux-drop-selinux-support.patch \ file://0001-configure-drop-selinux-support.patch \ file://0001-Add-additional-cgroup-mounts-from-root-NS-automatica.patch \ diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb index d2f14f31..d6426532 100644 --- a/recipes-containers/runc/runc-opencontainers_git.bb +++ b/recipes-containers/runc/runc-opencontainers_git.bb @@ -2,7 +2,7 @@ include runc.inc SRCREV = "249bca0a1316129dcd5bd38b5d75572274181cb5" SRC_URI = " \ - git://github.com/opencontainers/runc;branch=master \ + git://github.com/opencontainers/runc;branch=main \ file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \ " RUNC_VERSION = "1.0.0-rc93" diff --git a/recipes-containers/singularity/singularity_git.bb b/recipes-containers/singularity/singularity_git.bb index 103270dd..29cd45cf 100644 --- a/recipes-containers/singularity/singularity_git.bb +++ b/recipes-containers/singularity/singularity_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT.md;md5=be78c34e483dd7d8439358b1e024b294 \ file://LICENSE.md;md5=df4326b473db6424033f1d98a5645e30 \ file://debian/copyright;md5=ed267cf386d9b75ab1f27f407e935b10" -SRC_URI = "git://github.com/singularityware/singularity.git;protocol=https \ +SRC_URI = "git://github.com/singularityware/singularity.git;protocol=https;branch=master \ file://0001-Use-python3.patch \ " PV = "2.3.1+git${SRCPV}" diff --git a/recipes-containers/sloci-image/sloci-image-native_git.bb b/recipes-containers/sloci-image/sloci-image-native_git.bb index a68c6d9a..212bfad0 100644 --- a/recipes-containers/sloci-image/sloci-image-native_git.bb +++ b/recipes-containers/sloci-image/sloci-image-native_git.bb @@ -1,7 +1,7 @@ SUMMARY = "A simple CLI tool for packing rootfs into a single-layer OCI image" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=948cd8e59069fad992b0469af9ad7966" -SRC_URI = "git://github.com/jirutka/sloci-image.git \ +SRC_URI = "git://github.com/jirutka/sloci-image.git;branch=master \ file://0001-sloci-image-fix-variant-quoting.patch \ " diff --git a/recipes-containers/tini/tini_0.19.0.bb b/recipes-containers/tini/tini_0.19.0.bb index 62e285df..27463484 100644 --- a/recipes-containers/tini/tini_0.19.0.bb +++ b/recipes-containers/tini/tini_0.19.0.bb @@ -6,7 +6,7 @@ it to exit all the while reaping zombies and performing signal forwarding. " SRCREV = "b9f42a0e7bb46efea0c9e3d8610c96ab53b467f8" SRC_URI = " \ - git://github.com/krallin/tini.git \ + git://github.com/krallin/tini.git;branch=master \ file://0001-Do-not-strip-the-output-binary-allow-yocto-to-do-thi.patch \ " diff --git a/recipes-core/busybox/busybox-initrd_1.33.1.bb b/recipes-core/busybox/busybox-initrd_1.33.2.bb index 5ce5fa52..5ce5fa52 100644 --- a/recipes-core/busybox/busybox-initrd_1.33.1.bb +++ b/recipes-core/busybox/busybox-initrd_1.33.2.bb diff --git a/recipes-core/kata-containers/kata-agent_git.bb b/recipes-core/kata-containers/kata-agent_git.bb index 3632ee52..f4a65155 100644 --- a/recipes-core/kata-containers/kata-agent_git.bb +++ b/recipes-core/kata-containers/kata-agent_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://src/github.com/kata-containers/agent/LICENSE;md5=86d3 GO_IMPORT = "github.com/kata-containers/agent" SRCREV = "e03f7d7453fabffb17e1540f28666c26178d3cbf" -SRC_URI = "git://${GO_IMPORT}.git \ +SRC_URI = "git://${GO_IMPORT}.git;branch=master \ " RDEPENDS_${PN}-dev_append = "bash" diff --git a/recipes-core/kata-containers/kata-proxy_git.bb b/recipes-core/kata-containers/kata-proxy_git.bb index 8de0bfcf..06458d2c 100644 --- a/recipes-core/kata-containers/kata-proxy_git.bb +++ b/recipes-core/kata-containers/kata-proxy_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://src/github.com/kata-containers/proxy/LICENSE;md5=86d3 GO_IMPORT = "github.com/kata-containers/proxy" SRCREV = "1148847739f9a9f47b92e34e4f309dc109d4dba9" -SRC_URI = "git://${GO_IMPORT}.git \ +SRC_URI = "git://${GO_IMPORT}.git;branch=master \ " RDEPENDS_${PN}-dev_append = "bash" diff --git a/recipes-core/kata-containers/kata-runtime_git.bb b/recipes-core/kata-containers/kata-runtime_git.bb index 403d552e..fbabe077 100644 --- a/recipes-core/kata-containers/kata-runtime_git.bb +++ b/recipes-core/kata-containers/kata-runtime_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://src/github.com/kata-containers/runtime/LICENSE;md5=86 GO_IMPORT = "github.com/kata-containers/runtime" SRCREV = "04c77eb20e9bd603cab5c711bcbe7c69db58b040" -SRC_URI = "git://${GO_IMPORT}.git \ +SRC_URI = "git://${GO_IMPORT}.git;branch=master \ file://0001-makefile-allow-SKIP_GO_VERSION_CHECK-to-be-overriden.patch \ " RDEPENDS_${PN}-dev_append = "bash" diff --git a/recipes-core/kata-containers/kata-shim_git.bb b/recipes-core/kata-containers/kata-shim_git.bb index fb55a8e7..ebf945da 100644 --- a/recipes-core/kata-containers/kata-shim_git.bb +++ b/recipes-core/kata-containers/kata-shim_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://src/github.com/kata-containers/shim/LICENSE;md5=86d3f GO_IMPORT = "github.com/kata-containers/shim" SRCREV = "bcc35aeca3ef6fa0976005c9e93525906aefed2f" -SRC_URI = "git://${GO_IMPORT}.git \ +SRC_URI = "git://${GO_IMPORT}.git;branch=master \ " RDEPENDS_${PN}-dev_append = "bash" diff --git a/recipes-devtools/go/compose-file_git.bb b/recipes-devtools/go/compose-file_git.bb index bcf8c3d2..fc99a17e 100644 --- a/recipes-devtools/go/compose-file_git.bb +++ b/recipes-devtools/go/compose-file_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=9cd86830b557232ce55e2a6b4 SRCNAME = "compose-file" PKG_NAME = "github.com/aanand/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME}" +SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https" SRCREV = "a3e58764f50597b6217fec07e9bff7225c4a1719" PV = "3.0+git${SRCPV}" diff --git a/recipes-devtools/go/go-capability_git.bb b/recipes-devtools/go/go-capability_git.bb index 8524af62..29c93a07 100644 --- a/recipes-devtools/go/go-capability_git.bb +++ b/recipes-devtools/go/go-capability_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a7304f5073e7be4ba7bffabbf9f2bbca" SRCNAME = "gocapability" PKG_NAME = "github.com/syndtr/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git" +SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https" SRCREV = "2c00daeb6c3b45114c80ac44119e7b8801fdd852" PV = "0.0+git${SRCPV}" diff --git a/recipes-devtools/go/go-cli_git.bb b/recipes-devtools/go/go-cli_git.bb index 434594c9..73d024ec 100644 --- a/recipes-devtools/go/go-cli_git.bb +++ b/recipes-devtools/go/go-cli_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ed9b539ed65d73926f30ff1f1587dc44" SRCNAME = "cli" PKG_NAME = "github.com/codegangsta/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git" +SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https" SRCREV = "27ecc97192df1bf053a22b04463f2b51b8b8373e" PV = "1.1.0+git${SRCPV}" diff --git a/recipes-devtools/go/go-connections_git.bb b/recipes-devtools/go/go-connections_git.bb index 5d071b0a..af9d74fc 100644 --- a/recipes-devtools/go/go-connections_git.bb +++ b/recipes-devtools/go/go-connections_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=04424bc6f5a5be60691b9824d SRCNAME = "go-connections" PKG_NAME = "github.com/docker/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME}" +SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https" SRCREV = "4ccf312bf1d35e5dbda654e57a9be4c3f3cd0366" PV = "0.2.1+git${SRCPV}" diff --git a/recipes-devtools/go/go-context_git.bb b/recipes-devtools/go/go-context_git.bb index 15f6a8dd..099ff6e0 100644 --- a/recipes-devtools/go/go-context_git.bb +++ b/recipes-devtools/go/go-context_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c50f6bd9c1e15ed0bad3bea18e3c1b7f" SRCNAME = "context" PKG_NAME = "github.com/gorilla/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git" +SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https" SRCREV = "14f550f51af52180c2eefed15e5fd18d63c0a64a" diff --git a/recipes-devtools/go/go-dbus_git.bb b/recipes-devtools/go/go-dbus_git.bb index 23908619..bc2b0dbc 100644 --- a/recipes-devtools/go/go-dbus_git.bb +++ b/recipes-devtools/go/go-dbus_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=09042bd5c6c96a2b9e45ddf1bc517eed" SRCNAME = "dbus" PKG_NAME = "github.com/godbus/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git" +SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https" SRCREV = "5f6efc7ef2759c81b7ba876593971bfce311eab3" PV = "4.0.0+git${SRCPV}" diff --git a/recipes-devtools/go/go-fsnotify_git.bb b/recipes-devtools/go/go-fsnotify_git.bb index 0826aa7f..b50ab2d8 100644 --- a/recipes-devtools/go/go-fsnotify_git.bb +++ b/recipes-devtools/go/go-fsnotify_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c38914c9a7ab03bb2b96d4baaee10769" SRCNAME = "fsnotify" PKG_NAME = "github.com/fsnotify/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git" +SRC_URI = "git://${PKG_NAME}.git;branch=main;protocol=https" SRCREV = "836bfd95fecc0f1511dd66bdbf2b5b61ab8b00b6" PV = "1.2.11+git${SRCPV}" diff --git a/recipes-devtools/go/go-libtrust_git.bb b/recipes-devtools/go/go-libtrust_git.bb index 55659464..c333c6c1 100644 --- a/recipes-devtools/go/go-libtrust_git.bb +++ b/recipes-devtools/go/go-libtrust_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8" SRCNAME = "libtrust" PKG_NAME = "github.com/docker/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git" +SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https" SRCREV = "9cbd2a1374f46905c68a4eb3694a130610adc62a" PV = "0.0+git${SRCPV}" diff --git a/recipes-devtools/go/go-logrus_git.bb b/recipes-devtools/go/go-logrus_git.bb index aa89033e..ab52b7a6 100644 --- a/recipes-devtools/go/go-logrus_git.bb +++ b/recipes-devtools/go/go-logrus_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8dadfef729c08ec4e631c4f6fc5d43a0" SRCNAME = "logrus" PKG_NAME = "github.com/Sirupsen/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git" +SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https" SRCREV = "d26492970760ca5d33129d2d799e34be5c4782eb" PV = "0.11.0+git${SRCPV}" diff --git a/recipes-devtools/go/go-md2man_git.bb b/recipes-devtools/go/go-md2man_git.bb index a1fcbe9b..987c3a78 100644 --- a/recipes-devtools/go/go-md2man_git.bb +++ b/recipes-devtools/go/go-md2man_git.bb @@ -9,7 +9,7 @@ BBCLASSEXTEND = "native" GO_IMPORT = "github.com/cpuguy83/go-md2man" #GO_INSTALL = "${GO_IMPORT}/bin/go-md2man" -SRC_URI = "git://${GO_IMPORT}.git" +SRC_URI = "git://${GO_IMPORT}.git;branch=master" SRCREV = "f79a8a8ca69da163eee19ab442bedad7a35bba5a" PV = "1.0.10+git${SRCPV}" diff --git a/recipes-devtools/go/go-metalinter_git.bb b/recipes-devtools/go/go-metalinter_git.bb index 668b431a..318986eb 100644 --- a/recipes-devtools/go/go-metalinter_git.bb +++ b/recipes-devtools/go/go-metalinter_git.bb @@ -9,7 +9,7 @@ BBCLASSEXTEND = "native" SRCNAME = "gometalinter" PKG_NAME = "github.com/alecthomas/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git" +SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https" SRCREV = "e8d801238da6f0dfd14078d68f9b53fa50a7eeb5" PV = "0.0+git${SRCPV}" diff --git a/recipes-devtools/go/go-mux_git.bb b/recipes-devtools/go/go-mux_git.bb index 7a2025a0..9ed11d36 100644 --- a/recipes-devtools/go/go-mux_git.bb +++ b/recipes-devtools/go/go-mux_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c50f6bd9c1e15ed0bad3bea18e3c1b7f" SRCNAME = "mux" PKG_NAME = "github.com/gorilla/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git" +SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https" SRCREV = "136d54f81f00414c45c3c68dd47e98cc97519c5e" diff --git a/recipes-devtools/go/go-patricia_git.bb b/recipes-devtools/go/go-patricia_git.bb index 8c1e10d9..7e18af8d 100644 --- a/recipes-devtools/go/go-patricia_git.bb +++ b/recipes-devtools/go/go-patricia_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9949b99212edd6b1e24ce702376c3baf" SRCNAME = "go-patricia" PKG_NAME = "github.com/tchap/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git" +SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https" SRCREV = "666120de432aea38ab06bd5c818f04f4129882c9" PV = "2.2.6+git${SRCPV}" diff --git a/recipes-devtools/go/go-pty_git.bb b/recipes-devtools/go/go-pty_git.bb index 02cef69e..3ef6ea34 100644 --- a/recipes-devtools/go/go-pty_git.bb +++ b/recipes-devtools/go/go-pty_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://License;md5=93958070863d769117fa33b129020050" SRCNAME = "pty" PKG_NAME = "github.com/creack/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git" +SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https" SRCREV = "05017fcccf23c823bfdea560dcc958a136e54fb7" diff --git a/recipes-devtools/go/grpc-go_git.bb b/recipes-devtools/go/grpc-go_git.bb index 48c42499..da07f0d6 100644 --- a/recipes-devtools/go/grpc-go_git.bb +++ b/recipes-devtools/go/grpc-go_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=a4bad33881612090c6035d839 SRCNAME = "grpc-go" PKG_NAME = "google.golang.org/grpc" -SRC_URI = "git://github.com/grpc/${SRCNAME}.git;destsuffix=git/src/${PKG_NAME}" +SRC_URI = "git://github.com/grpc/${SRCNAME}.git;destsuffix=git/src/${PKG_NAME};branch=master" SRCREV = "777daa17ff9b5daef1cfdf915088a2ada3332bf0" PV = "1.4.0+git${SRCPV}" diff --git a/recipes-devtools/go/notary_git.bb b/recipes-devtools/go/notary_git.bb index 9cfb46ea..9bcb393e 100644 --- a/recipes-devtools/go/notary_git.bb +++ b/recipes-devtools/go/notary_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=3596b980bb036e0875174ed15 SRCNAME = "notary" PKG_NAME = "github.com/docker/${SRCNAME}" -SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME}" +SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master;protocol=https" SRCREV = "d6e1431feb32348e0650bf7551ac5cffd01d857b" PV = "0.6.1+git${SRCPV}" diff --git a/recipes-devtools/yq/yq_git.bb b/recipes-devtools/yq/yq_git.bb index 6d421822..499b2718 100644 --- a/recipes-devtools/yq/yq_git.bb +++ b/recipes-devtools/yq/yq_git.bb @@ -15,14 +15,14 @@ SRCREV_logging = "b2cb9fa56473e98db8caba80237377e83fe44db5" SRCREV_yaml = "eeeca48fe7764f320e4870d231902bf9c1be2c08" SRCREV_FORMAT = "yq_color" -SRC_URI = "git://${GO_IMPORT};name=yq \ - git://github.com/fatih/color;name=color;destsuffix=build/vendor/src/github.com/fatih/color \ - git://github.com/goccy/go-yaml;name=lexer;destsuffix=build/vendor/src/github.com/goccy/go-yaml/ \ - git://github.com/kylelemons/godebug;name=debug;destsuffix=build/vendor/src/github.com/kylelemons/godebug/ \ - git://github.com/pkg/errors;name=errors;destsuffix=build/vendor/src/github.com/pkg/errors/ \ - git://github.com/spf13/cobra;name=cobra;destsuffix=build/vendor/src/github.com/spf13/cobra \ - git://github.com/spf13/pflag;name=pflag;destsuffix=build/vendor/src/github.com/spf13/pflag \ - git://github.com/op/go-logging.git;name=logging;destsuffix=build/vendor/src/gopkg.in/op/go-logging.v1 \ +SRC_URI = "git://${GO_IMPORT};name=yq;branch=master \ + git://github.com/fatih/color;name=color;destsuffix=build/vendor/src/github.com/fatih/color;branch=master \ + git://github.com/goccy/go-yaml;name=lexer;destsuffix=build/vendor/src/github.com/goccy/go-yaml/;branch=master \ + git://github.com/kylelemons/godebug;name=debug;destsuffix=build/vendor/src/github.com/kylelemons/godebug/;branch=master \ + git://github.com/pkg/errors;name=errors;destsuffix=build/vendor/src/github.com/pkg/errors/;branch=master \ + git://github.com/spf13/cobra;name=cobra;destsuffix=build/vendor/src/github.com/spf13/cobra;branch=master \ + git://github.com/spf13/pflag;name=pflag;destsuffix=build/vendor/src/github.com/spf13/pflag;branch=master \ + git://github.com/op/go-logging.git;name=logging;destsuffix=build/vendor/src/gopkg.in/op/go-logging.v1;branch=master \ git://github.com/go-yaml/yaml.git;name=yaml;branch=v3;destsuffix=build/vendor/src/gopkg.in/yaml.v3 \ " diff --git a/recipes-extended/cloud-init/cloud-init_20.3.bb b/recipes-extended/cloud-init/cloud-init_20.3.bb index b9efb31f..1abcf8ab 100644 --- a/recipes-extended/cloud-init/cloud-init_20.3.bb +++ b/recipes-extended/cloud-init/cloud-init_20.3.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=c6dd79b6ec2130a3364f6fa9d6380408" SRCREV = "1431c8a1bddaabf85e1bbb32bf316a3aef20036e" -SRC_URI = "git://github.com/canonical/cloud-init \ +SRC_URI = "git://github.com/canonical/cloud-init;branch=main;protocol=https \ file://cloud-init-source-local-lsb-functions.patch \ file://0001-setup.py-check-for-install-anywhere-in-args.patch \ file://0001-setup.py-respect-udevdir-variable.patch \ diff --git a/recipes-extended/dev86/dev86/0002-Makefile-use-ifdefg-from-dev86-native-instead-of-tar.patch b/recipes-extended/dev86/dev86/0002-Makefile-use-ifdefg-from-dev86-native-instead-of-tar.patch deleted file mode 100644 index 52d5d59a..00000000 --- a/recipes-extended/dev86/dev86/0002-Makefile-use-ifdefg-from-dev86-native-instead-of-tar.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9b347a5ee9604d4ec972506328ee44a0d8eb1bf0 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Fri, 14 May 2021 06:32:02 -0700 -Subject: [PATCH] Makefile: use ifdefg from dev86-native instead of target - -* recipe is restricted to: - COMPATIBLE_HOST = "(i.86|x86_64).*-linux" - so it's less likely to reproduce invalid combination of - host and target, but I guess if you have aarch64 build - machine and build for x86 then it might fail as for Bruce: - -| ./ifdefg -MU makefile.in >tmp.mak -| /bin/sh: 1: ./ifdefg: not found -| make[1]: *** [Makefile:46: make.fil] Error 127 - - use ifdefg from native build to increase chances that it - will be compatible with your host system - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 8a61b65..7fdf861 100644 ---- a/Makefile -+++ b/Makefile -@@ -43,7 +43,7 @@ realclean: - -for X in */; do cd $$X && make clean; cd $(WD); done - - make.fil: $(IFDEFNAME) makefile.in -- ./$(IFDEFNAME) -MU $(IFDEFOPTS) makefile.in >tmp.mak -+ $(IFDEFNAME) -MU $(IFDEFOPTS) makefile.in >tmp.mak - echo > tmp.sed - [ "$(BINDIR)" != "//bin" ] || echo >> tmp.sed "s:%BINDIR%:/bin:" - [ "$(LIBDIR)" != "//lib/bcc" ] || echo >> tmp.sed "s:%LIBDIR%:/lib/bcc:" diff --git a/recipes-extended/dev86/dev86/cross.patch b/recipes-extended/dev86/dev86/cross.patch new file mode 100644 index 00000000..041a8d31 --- /dev/null +++ b/recipes-extended/dev86/dev86/cross.patch @@ -0,0 +1,29 @@ +Build ifdef using BUILD_CC, not CC. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/Makefile b/Makefile +index 8a61b65..99f41de 100644 +--- a/Makefile ++++ b/Makefile +@@ -22,6 +22,10 @@ CFLAGS= -O + IFDEFNAME= ifdef + WD=$(shell pwd) + ++BUILD_CC ?= $(CC) ++BUILD_CFLAGS ?= $(CFLAGS) ++BUILD_LDFLAGS ?= $(LDFLAGS) ++ + # Some makes take the last of a list as the default ... + all: make.fil + PATH="`pwd`/bin:$$PATH" $(MAKE) -f make.fil VERSION=$(VERSION) TOPDIR=`pwd` $@ +@@ -65,7 +69,7 @@ make.fil: $(IFDEFNAME) makefile.in + @rm -f tmp.mak tmp.sed + + $(IFDEFNAME): ifdef.c +- $(CC) $(IFDEFARCH) $(CFLAGS) $(IFDEFFLAGS) $(LDFLAGS) -o $(IFDEFNAME) ifdef.c ++ $(BUILD_CC) $(IFDEFARCH) $(BUILD_CFLAGS) $(IFDEFFLAGS) $(BUILD_LDFLAGS) -o $(IFDEFNAME) ifdef.c + + uninstall: + @echo 'Sorry, no go; it was just wrong.' diff --git a/recipes-extended/dev86/dev86_git.bb b/recipes-extended/dev86/dev86_git.bb index ad7a0dfd..847b48c4 100644 --- a/recipes-extended/dev86/dev86_git.bb +++ b/recipes-extended/dev86/dev86_git.bb @@ -7,20 +7,18 @@ SECTION = "console/tools" BASE_PV="0.16.21" PV = "${BASE_PV}+git${SRCPV}" SRCREV = "e254e0b19651d3b8a20225b40281c9974a95dec4" -SRC_URI = "git://github.com/jbruchon/${BPN}.git;protocol=https \ +SRC_URI = "git://github.com/jbruchon/${BPN}.git;protocol=https;branch=master \ file://0001-cpp-Makefile-respect-LDFLAGS-when-building-bcc-cpp.patch \ file://0003-cpp-update-token1.tok-to-make-new-gperf-happy-regen..patch \ file://0004-regen-token2.h-token1.h-with-gperf-3.1.patch \ -" -SRC_URI_append_class-target = " \ - file://0002-Makefile-use-ifdefg-from-dev86-native-instead-of-tar.patch \ + file://cross.patch \ " S = "${WORKDIR}/git" -DEPENDS = "gperf-native dev86-native" +DEPENDS = "gperf-native" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" EXTRA_OEMAKE = "VERSION=${BASE_PV} PREFIX=${prefix} DIST=${D} LDFLAGS='${LDFLAGS}' INEXE=''" do_compile() { @@ -41,8 +39,4 @@ do_install() { ln -s ../lib/bcc/bcc-cc1 ${D}${prefix}/bin/bcc-cc1 } -do_install_append_class-native() { - install -v -m 755 ${B}/ifdefg ${D}${bindir} -} - FILES_${PN} += "${libdir}/bcc" diff --git a/recipes-extended/diod/diod_1.0.24.bb b/recipes-extended/diod/diod_1.0.24.bb index a4a85284..a9f1431e 100644 --- a/recipes-extended/diod/diod_1.0.24.bb +++ b/recipes-extended/diod/diod_1.0.24.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" PV = "1.0.24+git${SRCPV}" SRCREV = "0ea3fe3d829b5085307cd27a512708d99ef48199" -SRC_URI = "git://github.com/chaos/diod.git;protocol=git \ +SRC_URI = "git://github.com/chaos/diod.git;protocol=git;branch=master \ file://diod \ file://diod.conf \ file://0001-build-allow-builds-to-work-with-separate-build-dir.patch \ diff --git a/recipes-extended/hyperstart/hyperstart_git.bb b/recipes-extended/hyperstart/hyperstart_git.bb index 1126aa1b..edace05a 100644 --- a/recipes-extended/hyperstart/hyperstart_git.bb +++ b/recipes-extended/hyperstart/hyperstart_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" inherit autotools-brokensep -SRC_URI = "git://github.com/hyperhq/hyperstart.git" +SRC_URI = "git://github.com/hyperhq/hyperstart.git;branch=master" SRC_URI += "file://0001-container.c-Fix-compiler-errors-that-gcc-8.1.0-repor.patch" SRCREV = "c0c07d218b482dd07f9068b52a6e7468ae4172ac" diff --git a/recipes-extended/ipxe/ipxe_git.bb b/recipes-extended/ipxe/ipxe_git.bb index 43c8f0ed..5b1c482f 100644 --- a/recipes-extended/ipxe/ipxe_git.bb +++ b/recipes-extended/ipxe/ipxe_git.bb @@ -14,7 +14,7 @@ PR = "r0" FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRC_URI = " \ - git://github.com/ipxe/ipxe.git;protocol=https \ + git://github.com/ipxe/ipxe.git;protocol=https;branch=master \ file://ipxe-fix-hostcc-nopie-cflags.patch \ file://ipxe-intel-Avoid-spurious-compiler-warning-on-GCC-10.patch \ file://ipxe-golan-Add-explicit-type-casts-for-nodnic_queue_pair_.patch \ diff --git a/recipes-extended/irqbalance/irqbalance_git.bb b/recipes-extended/irqbalance/irqbalance_git.bb index 1a96c169..df397b87 100644 --- a/recipes-extended/irqbalance/irqbalance_git.bb +++ b/recipes-extended/irqbalance/irqbalance_git.bb @@ -9,7 +9,7 @@ require irqbalance.inc SRCREV = "641edc6f5d56f1b3eb8be0fa8a8e9b6a22e53218" PV = "1.7.0" -SRC_URI = "git://github.com/Irqbalance/irqbalance \ +SRC_URI = "git://github.com/Irqbalance/irqbalance;branch=master \ file://add-initscript.patch \ file://irqbalance-Add-status-and-reload-commands.patch \ file://irqbalanced.service \ diff --git a/recipes-extended/kvmtool/kvmtool.bb b/recipes-extended/kvmtool/kvmtool.bb index 822d97b9..b99bbc89 100644 --- a/recipes-extended/kvmtool/kvmtool.bb +++ b/recipes-extended/kvmtool/kvmtool.bb @@ -9,7 +9,7 @@ do_configure[depends] += "virtual/kernel:do_shared_workdir" inherit kernel-arch -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git \ +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git;branch=master \ file://external-crosscompiler.patch \ file://0001-kvmtool-9p-fixed-compilation-error.patch \ file://0002-kvmtool-add-EXTRA_CFLAGS-variable.patch \ diff --git a/recipes-extended/libvirt/libvirt/CVE-2021-3975.patch b/recipes-extended/libvirt/libvirt/CVE-2021-3975.patch new file mode 100644 index 00000000..72cee94c --- /dev/null +++ b/recipes-extended/libvirt/libvirt/CVE-2021-3975.patch @@ -0,0 +1,43 @@ +From 30de45c73106cacfc0aacc8f11c88e1aa5372d77 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Sat, 29 Jan 2022 13:25:54 +0800 +Subject: [PATCH] qemu: Add missing lock in qemuProcessHandleMonitorEOF + +qemuMonitorUnregister will be called in multiple threads (e.g. threads +in rpc worker pool and the vm event thread). In some cases, it isn't +protected by the monitor lock, which may lead to call g_source_unref +more than one time and a use-after-free problem eventually. + +Add the missing lock in qemuProcessHandleMonitorEOF (which is the only +position missing lock of monitor I found). + +Suggested-by: Michal Privoznik <mprivozn@redhat.com> +Signed-off-by: Peng Liang <liangpeng10@huawei.com> +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +Reviewed-by: Michal Privoznik <mprivozn@redhat.com> + +Upstream-Status: Backport [https://github.com/libvirt/libvirt/commit/1ac703a7d0789e46833f4013a3876c2e3af18ec7] +CVE: CVE-2021-3975 + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + src/qemu/qemu_process.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c +index 8ea470f..64b8472 100644 +--- a/src/qemu/qemu_process.c ++++ b/src/qemu/qemu_process.c +@@ -315,7 +315,9 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon, + /* We don't want this EOF handler to be called over and over while the + * thread is waiting for a job. + */ ++ virObjectLock(mon); + qemuMonitorUnregister(mon); ++ virObjectUnlock(mon); + + /* We don't want any cleanup from EOF handler (or any other + * thread) to enter qemu namespace. */ +-- +2.17.1 + diff --git a/recipes-extended/libvirt/libvirt/CVE-2022-0897.patch b/recipes-extended/libvirt/libvirt/CVE-2022-0897.patch new file mode 100644 index 00000000..e98f40bf --- /dev/null +++ b/recipes-extended/libvirt/libvirt/CVE-2022-0897.patch @@ -0,0 +1,57 @@ +From d470667167fa585d2bc3b996fb3bf2786d44be9a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> +Date: Tue, 8 Mar 2022 17:28:38 +0000 +Subject: [PATCH] nwfilter: fix crash when counting number of network filters +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The virNWFilterObjListNumOfNWFilters method iterates over the +driver->nwfilters, accessing virNWFilterObj instances. As such +it needs to be protected against concurrent modification of +the driver->nwfilters object. + +This API allows unprivileged users to connect, so users with +read-only access to libvirt can cause a denial of service +crash if they are able to race with a call of virNWFilterUndefine. +Since network filters are usually statically defined, this is +considered a low severity problem. + +This is assigned CVE-2022-0897. + +Reviewed-by: Eric Blake <eblake@redhat.com> +Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> + +Upstream-Status: Backport [https://gitlab.com/libvirt/libvirt/-/commit/a4947e8f63c3e6b7b067b444f3d6cf674c0d7f36] +CVE: CVE-2022-0897 + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + src/nwfilter/nwfilter_driver.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c +index 1c40772..27500d1 100644 +--- a/src/nwfilter/nwfilter_driver.c ++++ b/src/nwfilter/nwfilter_driver.c +@@ -514,11 +514,15 @@ nwfilterLookupByName(virConnectPtr conn, + static int + nwfilterConnectNumOfNWFilters(virConnectPtr conn) + { ++ int ret; + if (virConnectNumOfNWFiltersEnsureACL(conn) < 0) + return -1; + +- return virNWFilterObjListNumOfNWFilters(driver->nwfilters, conn, +- virConnectNumOfNWFiltersCheckACL); ++ nwfilterDriverLock(); ++ ret = virNWFilterObjListNumOfNWFilters(driver->nwfilters, conn, ++ virConnectNumOfNWFiltersCheckACL); ++ nwfilterDriverUnlock(); ++ return ret; + } + + +-- +2.25.1 + diff --git a/recipes-extended/libvirt/libvirt_6.3.0.bb b/recipes-extended/libvirt/libvirt_6.3.0.bb index 091296ef..48e5b58c 100644 --- a/recipes-extended/libvirt/libvirt_6.3.0.bb +++ b/recipes-extended/libvirt/libvirt_6.3.0.bb @@ -46,6 +46,8 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.xz;name=libvirt \ file://CVE-2020-25637_4.patch \ file://CVE-2021-3631.patch \ file://0001-storage_driver-Unlock-object-on-ACL-fail-in-storageP.patch \ + file://CVE-2021-3975.patch \ + file://CVE-2022-0897.patch \ " SRC_URI[libvirt.md5sum] = "1bd4435f77924f5ec9928b538daf4a02" diff --git a/recipes-extended/libvmi/libvmi_git.bb b/recipes-extended/libvmi/libvmi_git.bb index b8e35669..7986bed7 100644 --- a/recipes-extended/libvmi/libvmi_git.bb +++ b/recipes-extended/libvmi/libvmi_git.bb @@ -8,7 +8,7 @@ PV = "0.12.0" DEPENDS = "libvirt libcheck bison fuse byacc-native" -SRC_URI = "git://github.com/libvmi/libvmi.git \ +SRC_URI = "git://github.com/libvmi/libvmi.git;branch=master \ " SRCREV = "e8c2061d11c42e5868cbf48229f59b5e7071395a" diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc index 3560e798..5ab4265d 100644 --- a/recipes-extended/xen/xen-tools.inc +++ b/recipes-extended/xen/xen-tools.inc @@ -649,10 +649,10 @@ FILES_${PN}-xm = "\ " FILES_${PN}-xencommons += "\ + ${nonarch_libdir}/modules-load.d/xen.conf \ ${sysconfdir}/default/xencommons \ ${sysconfdir}/init.d/xencommons \ ${sysconfdir}/xen/scripts/launch-xenstore \ - ${systemd_unitdir}/modules-load.d/xen.conf \ ${systemd_unitdir}/system/proc-xen.mount \ ${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service \ ${systemd_unitdir}/system/xenconsoled.service \ @@ -715,7 +715,6 @@ SYSTEMD_SERVICE_${PN}-xendomains = "xendomains.service" EXTRA_OECONF += " \ --with-systemd=${systemd_unitdir}/system \ - --with-systemd-modules-load=${systemd_unitdir}/modules-load.d \ --with-initddir=${INIT_D_DIR} \ --with-sysconfig-leaf-dir=default \ --with-system-qemu=${bindir}/qemu-system-i386 \ diff --git a/recipes-extended/xen/xtf_git.bb b/recipes-extended/xen/xtf_git.bb index 35803241..77f9206c 100644 --- a/recipes-extended/xen/xtf_git.bb +++ b/recipes-extended/xen/xtf_git.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-2-Clause" # For additional reference on XTF, please see: # https://static.sched.com/hosted_files/xendeveloperanddesignsummit2017/79/xtf.pdf -SRC_URI = "git://xenbits.xen.org/xtf" +SRC_URI = "git://xenbits.xen.org/xtf;branch=master" SRCREV = "b0bc49846c154b79243f39d461a4515804bcaf53" COMPATIBLE_HOST = '(x86_64.*).*-linux' diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb index d7f8e4b0..a66c9677 100644 --- a/recipes-networking/openvswitch/openvswitch_git.bb +++ b/recipes-networking/openvswitch/openvswitch_git.bb @@ -14,12 +14,12 @@ RDEPENDS_${PN}-ptest += "\ " S = "${WORKDIR}/git" -PV = "2.15+${SRCPV}" -CVE_VERSION = "2.13.0" +PV = "2.15.3+${SRCPV}" +CVE_VERSION = "2.15.3" FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:" -SRCREV = "8dc1733eaea866dce033b3c44853e1b09bf59fc7" +SRCREV = "e4d2df62e65a615e19f62e2fd294709be8d75cdc" SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.15 \ file://openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch \ file://run-ptest \ @@ -28,7 +28,6 @@ SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.15 file://systemd-update-tool-paths.patch \ file://systemd-create-runtime-dirs.patch \ file://0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch \ - file://0001-ofp-actions-Fix-use-after-free-while-decoding-RAW_EN.patch \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=1ce5d23a6429dff345518758f13aaeab" |