diff options
8 files changed, 9 insertions, 77 deletions
diff --git a/meta-sokol-flex-common/conf/layer.conf b/meta-sokol-flex-common/conf/layer.conf index beb0e92b..8638ab0b 100644 --- a/meta-sokol-flex-common/conf/layer.conf +++ b/meta-sokol-flex-common/conf/layer.conf @@ -8,4 +8,4 @@ BBFILE_COLLECTIONS += "sokol-flex-common" BBFILE_PATTERN_sokol-flex-common = "^${LAYERDIR}/" BBFILE_PATTERN_IGNORE_EMPTY_sokol-flex-common = "1" BBFILE_PRIORITY_sokol-flex-common = "1" -LAYERSERIES_COMPAT_sokol-flex-common = "mickledore" +LAYERSERIES_COMPAT_sokol-flex-common = "nanbield" diff --git a/meta-sokol-flex-distro/conf/distro/sokol-flex.conf b/meta-sokol-flex-distro/conf/distro/sokol-flex.conf index a7fc3f67..8c0d8ac1 100644 --- a/meta-sokol-flex-distro/conf/distro/sokol-flex.conf +++ b/meta-sokol-flex-distro/conf/distro/sokol-flex.conf @@ -7,7 +7,7 @@ require conf/distro/include/vendor.inc ## }}}1 ## Sokol Flex OS Base Configuration {{{1 DISTRO_NAME = "Sokol Flex OS" -DISTRO_CODENAME = "mickledore" +DISTRO_CODENAME = "nanbield" MAINTAINER = "Siemens Digital Industries Software <embedded_support@mentor.com>" HOME_URL = "https://www.plm.automation.siemens.com/global/en/products/embedded/flex-os.html" SUPPORT_URL = "https://support.sw.siemens.com/" @@ -203,7 +203,7 @@ FEATURE_PACKAGES_graphics += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${ FEATURE_PACKAGES_tools-audio ?= "packagegroup-tools-audio" FEATURE_PACKAGES_tools-benchmark ?= "packagegroup-tools-benchmark" FEATURE_PACKAGES_multimedia ?= "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad" -FEATURE_PACKAGES_virtualization ?= "docker-moby python3-docker-compose" +FEATURE_PACKAGES_virtualization ?= "docker-moby docker-compose" FEATURE_PACKAGES_codebench-debug ?= "gdbserver strace openssh-sftp-server" # Baseline runtime for third party multilib executables. @@ -348,6 +348,9 @@ include conf/distro/include/flex-iot.conf # MCF configuration include conf/distro/include/flex-mcf.conf +# Virtualization configuration +include conf/distro/include/flex-virtualization.conf + # INITRAMFS INITRAMFS_IMAGE ?= "flex-initramfs-image" INITRAMFS_IMAGE_BUNDLE ?= "${@bb.utils.contains('KERNEL_IMAGETYPES', 'fitImage', '', '1', d)}" diff --git a/meta-sokol-flex-distro/conf/layer.conf b/meta-sokol-flex-distro/conf/layer.conf index 4e93afee..5c9dabf2 100644 --- a/meta-sokol-flex-distro/conf/layer.conf +++ b/meta-sokol-flex-distro/conf/layer.conf @@ -18,7 +18,7 @@ BBFILES_DYNAMIC += "${@' '.join( \ BBFILE_COLLECTIONS += "sokol-flex-distro" BBFILE_PRIORITY_sokol-flex-distro = "12" BBFILE_PATTERN_sokol-flex-distro = "^${LAYERDIR_RE}/" -LAYERSERIES_COMPAT_sokol-flex-distro = "mickledore" +LAYERSERIES_COMPAT_sokol-flex-distro = "nanbield" LAYERDEPENDS_sokol-flex-distro = "core sokol-flex-common" LAYERRECOMMENDS_sokol-flex-distro = "sokol-flex-support sokol-flex-staging sourcery flex-private flex-cve flex-vendor-integration" LAYERRECOMMENDS_sokol-flex-distro += "openembedded-layer filesystems-layer networking-layer multimedia-layer" diff --git a/meta-sokol-flex-staging/conf/layer.conf b/meta-sokol-flex-staging/conf/layer.conf index 2fed6577..53718585 100644 --- a/meta-sokol-flex-staging/conf/layer.conf +++ b/meta-sokol-flex-staging/conf/layer.conf @@ -20,7 +20,7 @@ BBFILE_COLLECTIONS += "sokol-flex-staging" BBFILE_PRIORITY_sokol-flex-staging = "10" BBFILE_PATTERN_sokol-flex-staging = "^${LAYERDIR_RE}/" LAYERDEPENDS_sokol-flex-staging = "core sokol-flex-common" -LAYERSERIES_COMPAT_sokol-flex-staging = "mickledore" +LAYERSERIES_COMPAT_sokol-flex-staging = "nanbield" # We don't want systemd and everything depending on systemd to rebuild when # the metadata stored in os-release changes. TODO: push this to oe-core diff --git a/meta-sokol-flex-staging/dynamic-layers/virtualization-layer/recipes-containers/docker-compose/python3-docker-compose_%.bbappend b/meta-sokol-flex-staging/dynamic-layers/virtualization-layer/recipes-containers/docker-compose/python3-docker-compose_%.bbappend deleted file mode 100644 index 8952c852..00000000 --- a/meta-sokol-flex-staging/dynamic-layers/virtualization-layer/recipes-containers/docker-compose/python3-docker-compose_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -# --------------------------------------------------------------------------------------------------------------------- -# SPDX-License-Identifier: MIT -# --------------------------------------------------------------------------------------------------------------------- - -RDEPENDS:${PN}:append:feature-sokol-flex-staging = " ${PYTHON_PN}-distutils" diff --git a/meta-sokol-flex-staging/dynamic-layers/virtualization-layer/recipes-containers/docker/docker%.bbappend b/meta-sokol-flex-staging/dynamic-layers/virtualization-layer/recipes-containers/docker/docker%.bbappend deleted file mode 100644 index 478d65b6..00000000 --- a/meta-sokol-flex-staging/dynamic-layers/virtualization-layer/recipes-containers/docker/docker%.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -## The below are from 2d0f725 in meta-virtualization, pulled back into kirkstone. - -# Export for possible use in Makefiles, default value comes from go.bbclass -export GO_LINKSHARED - -# Override 0001-libnetwork-use-GO-instead-of-go.patch -FILESEXTRAPATHS:prepend:feature-sokol-flex-staging := "${THISDIR}/files:" diff --git a/meta-sokol-flex-staging/dynamic-layers/virtualization-layer/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch b/meta-sokol-flex-staging/dynamic-layers/virtualization-layer/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch deleted file mode 100644 index b9b41de5..00000000 --- a/meta-sokol-flex-staging/dynamic-layers/virtualization-layer/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 04c07804930faad708218a3134c81de06a9c742a Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Fri, 6 Apr 2018 23:58:22 -0400 -Subject: [PATCH] libnetwork: use $(GO) instead of go - -Ensure that the libnetwork makefile uses the go cross flags and -utilities. - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - Makefile | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -Index: git/libnetwork/Makefile -=================================================================== ---- git.orig/libnetwork/Makefile -+++ git/libnetwork/Makefile -@@ -45,9 +45,9 @@ - build-local: - @echo "🐳 $@" - @mkdir -p "bin" -- go build -tags experimental -o "bin/dnet" ./cmd/dnet -- go build -o "bin/docker-proxy" ./cmd/proxy -- CGO_ENABLED=0 go build -o "bin/diagnosticClient" ./cmd/diagnostic -+ $(GO) build -trimpath -tags experimental -o "bin/dnet" ./cmd/dnet -+ $(GO) build -trimpath -o "bin/proxy" ./cmd/proxy -+ CGO_ENABLED=0 $(GO) build -trimpath -o "bin/diagnosticClient" ./cmd/diagnostic - CGO_ENABLED=0 go build -o "bin/testMain" ./cmd/networkdb-test/testMain.go - - build-images: -@@ -82,8 +82,8 @@ - - cross-local: - @echo "🐳 $@" -- go build -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet -- go build -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy -+ @$(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy -+ @$(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet - - # Rebuild protocol buffers. - # These may need to be rebuilt after vendoring updates, so .proto files are declared .PHONY so they are always rebuilt. -@@ -130,7 +130,7 @@ - if ls $$dir/*.go &> /dev/null; then \ - pushd . &> /dev/null ; \ - cd $$dir ; \ -- go test ${INSIDECONTAINER} -test.parallel 5 -test.v -covermode=count -coverprofile=./profile.tmp ; \ -+ $(GO) test ${INSIDECONTAINER} -test.parallel 5 -test.v -covermode=count -coverprofile=./profile.tmp ; \ - ret=$$? ;\ - if [ $$ret -ne 0 ]; then exit $$ret; fi ;\ - popd &> /dev/null; \ -@@ -145,7 +145,7 @@ - # Depends on binaries because vet will silently fail if it can not load compiled imports - vet: ## run go vet - @echo "🐳 $@" -- @test -z "$$(go vet ${PACKAGES} 2>&1 | grep -v 'constant [0-9]* not a string in call to Errorf' | egrep -v '(timestamp_test.go|duration_test.go|exit status 1)' | tee /dev/stderr)" -+ @test -z "$$($(GO) vet ${PACKAGES} 2>&1 | grep -v 'constant [0-9]* not a string in call to Errorf' | egrep -v '(timestamp_test.go|duration_test.go|exit status 1)' | tee /dev/stderr)" - - misspell: - @echo "🐳 $@" diff --git a/meta-sokol-flex-support/conf/layer.conf b/meta-sokol-flex-support/conf/layer.conf index 3e612de7..10b55a0a 100644 --- a/meta-sokol-flex-support/conf/layer.conf +++ b/meta-sokol-flex-support/conf/layer.conf @@ -19,7 +19,7 @@ BBFILE_COLLECTIONS += "sokol-flex-support" BBFILE_PRIORITY_sokol-flex-support = "4" BBFILE_PATTERN_sokol-flex-support = "^${LAYERDIR_RE}/" LAYERDEPENDS_sokol-flex-support = "core sokol-flex-common" -LAYERSERIES_COMPAT_sokol-flex-support = "mickledore" +LAYERSERIES_COMPAT_sokol-flex-support = "nanbield" PREFERRED_PROVIDER_virtual/nativesdk-update-alternatives ??= "nativesdk-opkg-utils" PREFERRED_PROVIDER_chkconfig-alternatives ??= "chkconfig-alternatives" |