* [meta-virtualization][PATCH 1/2] skopeo: upgrade to 1.1.1
@ 2020-09-15 6:48 hongxu
2020-09-15 6:48 ` [meta-virtualization][PATCH 2/2] sloci-image: set CLEANBROKEN = 1 hongxu
2020-09-15 11:45 ` [meta-virtualization][PATCH 1/2] skopeo: upgrade to 1.1.1 Bruce Ashfield
0 siblings, 2 replies; 4+ messages in thread
From: hongxu @ 2020-09-15 6:48 UTC (permalink / raw)
To: meta-virtualization, bruce.ashfield
- Drop ostree
- Support native and nativesdk
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
.../skopeo/{skopeo_git.bb => skopeo_1.1.1.bb} | 50 +++++--------------
1 file changed, 12 insertions(+), 38 deletions(-)
rename recipes-containers/skopeo/{skopeo_git.bb => skopeo_1.1.1.bb} (33%)
diff --git a/recipes-containers/skopeo/skopeo_git.bb b/recipes-containers/skopeo/skopeo_1.1.1.bb
similarity index 33%
rename from recipes-containers/skopeo/skopeo_git.bb
rename to recipes-containers/skopeo/skopeo_1.1.1.bb
index f5a6231..ca23ac6 100644
--- a/recipes-containers/skopeo/skopeo_git.bb
+++ b/recipes-containers/skopeo/skopeo_1.1.1.bb
@@ -1,14 +1,14 @@
HOMEPAGE = "https://github.com/containers/skopeo"
SUMMARY = "Work with remote images registries - retrieving information, images, signing content"
LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=7e611105d3e369954840a6668c438584"
+LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=7e611105d3e369954840a6668c438584"
DEPENDS = " \
gpgme \
- multipath-tools \
+ libdevmapper \
+ lvm2 \
btrfs-tools \
glib-2.0 \
- ostree \
"
inherit go
@@ -17,64 +17,38 @@ RDEPENDS_${PN} = " \
gpgme \
libgpg-error \
libassuan \
+ libdevmapper \
"
SRC_URI = " \
- git://github.com/containers/skopeo \
+ git://${GO_IMPORT};branch=release-1.1 \
file://storage.conf \
file://registries.conf \
"
-SRCREV = "1cf1e06582142c522543560f2bc6d6756696e8ad"
-PV = "v0.1.39-dev+git${SRCPV}"
-GO_IMPORT = "import"
+SRCREV = "67abbb3cefbdc876447583d5ea45e76bf441eba7"
+GO_IMPORT = "github.com/containers/skopeo"
S = "${WORKDIR}/git"
inherit goarch
inherit pkgconfig
-# This disables seccomp and apparmor, which are on by default in the
-# go package.
-EXTRA_OEMAKE="BUILDTAGS=''"
-
do_compile() {
- export GOARCH="${TARGET_GOARCH}"
-
- # Setup vendor directory so that it can be used in GOPATH.
- #
- # Go looks in a src directory under any directory in GOPATH but riddler
- # uses 'vendor' instead of 'vendor/src'. We can fix this with a symlink.
- #
- # We also need to link in the ipallocator directory as that is not under
- # a src directory.
- ln -sfn . "${S}/src/import/vendor/src"
- mkdir -p "${S}/src/import/vendor/src/github.com/projectatomic/skopeo"
- ln -sfn "${S}/src/import/skopeo" "${S}/src/import/vendor/src/github.com/projectatomic/skopeo"
- ln -sfn "${S}/src/import/version" "${S}/src/import/vendor/src/github.com/projectatomic/skopeo/version"
- export GOPATH="${S}/src/import/vendor"
-
- # Pass the needed cflags/ldflags so that cgo
- # can find the needed headers files and libraries
- export CGO_ENABLED="1"
- export CFLAGS=""
- export LDFLAGS=""
- export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
- export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
- cd ${S}/src/import
-
+ cd ${S}/src/${GO_IMPORT}
oe_runmake binary-local
}
do_install() {
install -d ${D}/${sbindir}
install -d ${D}/${sysconfdir}/containers
-
- install ${S}/src/import/skopeo ${D}/${sbindir}/
- install ${S}/src/import/default-policy.json ${D}/${sysconfdir}/containers/policy.json
+ install ${S}/src/${GO_IMPORT}/skopeo ${D}/${sbindir}/
+ install ${S}/src/${GO_IMPORT}/default-policy.json ${D}/${sysconfdir}/containers/policy.json
install ${WORKDIR}/storage.conf ${D}/${sysconfdir}/containers/storage.conf
install ${WORKDIR}/registries.conf ${D}/${sysconfdir}/containers/registries.conf
}
INSANE_SKIP_${PN} += "ldflags"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.18.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-virtualization][PATCH 2/2] sloci-image: set CLEANBROKEN = 1
2020-09-15 6:48 [meta-virtualization][PATCH 1/2] skopeo: upgrade to 1.1.1 hongxu
@ 2020-09-15 6:48 ` hongxu
2020-09-21 21:32 ` Bruce Ashfield
2020-09-15 11:45 ` [meta-virtualization][PATCH 1/2] skopeo: upgrade to 1.1.1 Bruce Ashfield
1 sibling, 1 reply; 4+ messages in thread
From: hongxu @ 2020-09-15 6:48 UTC (permalink / raw)
To: meta-virtualization, bruce.ashfield
Workaround rebuild failure
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
recipes-containers/sloci-image/sloci-image_git.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-containers/sloci-image/sloci-image_git.bb b/recipes-containers/sloci-image/sloci-image_git.bb
index 30fa4c1..fc3c329 100644
--- a/recipes-containers/sloci-image/sloci-image_git.bb
+++ b/recipes-containers/sloci-image/sloci-image_git.bb
@@ -22,4 +22,6 @@ do_install() {
make PREFIX="${exec_prefix}" DESTDIR=${D} install
}
+CLEANBROKEN = "1"
+
BBCLASSEXTEND = "native nativesdk"
--
2.18.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-virtualization][PATCH 1/2] skopeo: upgrade to 1.1.1
2020-09-15 6:48 [meta-virtualization][PATCH 1/2] skopeo: upgrade to 1.1.1 hongxu
2020-09-15 6:48 ` [meta-virtualization][PATCH 2/2] sloci-image: set CLEANBROKEN = 1 hongxu
@ 2020-09-15 11:45 ` Bruce Ashfield
1 sibling, 0 replies; 4+ messages in thread
From: Bruce Ashfield @ 2020-09-15 11:45 UTC (permalink / raw)
To: Hongxu Jia; +Cc: meta-virtualization
On Tue, Sep 15, 2020 at 2:48 AM Hongxu Jia <hongxu.jia@windriver.com> wrote:
>
> - Drop ostree
We should be logging the skopeo commit that drops the support.
>
> - Support native and nativesdk
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
> .../skopeo/{skopeo_git.bb => skopeo_1.1.1.bb} | 50 +++++--------------
> 1 file changed, 12 insertions(+), 38 deletions(-)
> rename recipes-containers/skopeo/{skopeo_git.bb => skopeo_1.1.1.bb} (33%)
>
> diff --git a/recipes-containers/skopeo/skopeo_git.bb b/recipes-containers/skopeo/skopeo_1.1.1.bb
> similarity index 33%
> rename from recipes-containers/skopeo/skopeo_git.bb
> rename to recipes-containers/skopeo/skopeo_1.1.1.bb
> index f5a6231..ca23ac6 100644
> --- a/recipes-containers/skopeo/skopeo_git.bb
> +++ b/recipes-containers/skopeo/skopeo_1.1.1.bb
> @@ -1,14 +1,14 @@
> HOMEPAGE = "https://github.com/containers/skopeo"
> SUMMARY = "Work with remote images registries - retrieving information, images, signing content"
> LICENSE = "Apache-2.0"
> -LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=7e611105d3e369954840a6668c438584"
> +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=7e611105d3e369954840a6668c438584"
>
> DEPENDS = " \
> gpgme \
> - multipath-tools \
> + libdevmapper \
> + lvm2 \
> btrfs-tools \
> glib-2.0 \
> - ostree \
> "
>
> inherit go
> @@ -17,64 +17,38 @@ RDEPENDS_${PN} = " \
> gpgme \
> libgpg-error \
> libassuan \
> + libdevmapper \
> "
>
> SRC_URI = " \
> - git://github.com/containers/skopeo \
> + git://${GO_IMPORT};branch=release-1.1 \
Leave this as github.com, GO_IMPORT makes this unreadable. It can be used
below, but not in the SRC_URI.
> file://storage.conf \
> file://registries.conf \
> "
>
> -SRCREV = "1cf1e06582142c522543560f2bc6d6756696e8ad"
> -PV = "v0.1.39-dev+git${SRCPV}"
I don't like removing the PV and then having to re-add it constantly.
So although this is for now on a specific release, I want the PV with
+git to stay, since it is only going to be exactly on 1.1 for a very
small amount of time.
Cheers,
Bruce
> -GO_IMPORT = "import"
> +SRCREV = "67abbb3cefbdc876447583d5ea45e76bf441eba7"
> +GO_IMPORT = "github.com/containers/skopeo"
>
> S = "${WORKDIR}/git"
>
> inherit goarch
> inherit pkgconfig
>
> -# This disables seccomp and apparmor, which are on by default in the
> -# go package.
> -EXTRA_OEMAKE="BUILDTAGS=''"
> -
> do_compile() {
> - export GOARCH="${TARGET_GOARCH}"
> -
> - # Setup vendor directory so that it can be used in GOPATH.
> - #
> - # Go looks in a src directory under any directory in GOPATH but riddler
> - # uses 'vendor' instead of 'vendor/src'. We can fix this with a symlink.
> - #
> - # We also need to link in the ipallocator directory as that is not under
> - # a src directory.
> - ln -sfn . "${S}/src/import/vendor/src"
> - mkdir -p "${S}/src/import/vendor/src/github.com/projectatomic/skopeo"
> - ln -sfn "${S}/src/import/skopeo" "${S}/src/import/vendor/src/github.com/projectatomic/skopeo"
> - ln -sfn "${S}/src/import/version" "${S}/src/import/vendor/src/github.com/projectatomic/skopeo/version"
> - export GOPATH="${S}/src/import/vendor"
> -
> - # Pass the needed cflags/ldflags so that cgo
> - # can find the needed headers files and libraries
> - export CGO_ENABLED="1"
> - export CFLAGS=""
> - export LDFLAGS=""
> - export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
> - export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
> - cd ${S}/src/import
> -
> + cd ${S}/src/${GO_IMPORT}
> oe_runmake binary-local
> }
>
> do_install() {
> install -d ${D}/${sbindir}
> install -d ${D}/${sysconfdir}/containers
> -
> - install ${S}/src/import/skopeo ${D}/${sbindir}/
> - install ${S}/src/import/default-policy.json ${D}/${sysconfdir}/containers/policy.json
> + install ${S}/src/${GO_IMPORT}/skopeo ${D}/${sbindir}/
> + install ${S}/src/${GO_IMPORT}/default-policy.json ${D}/${sysconfdir}/containers/policy.json
>
> install ${WORKDIR}/storage.conf ${D}/${sysconfdir}/containers/storage.conf
> install ${WORKDIR}/registries.conf ${D}/${sysconfdir}/containers/registries.conf
> }
>
> INSANE_SKIP_${PN} += "ldflags"
> +
> +BBCLASSEXTEND = "native nativesdk"
> --
> 2.18.2
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [meta-virtualization][PATCH 2/2] sloci-image: set CLEANBROKEN = 1
2020-09-15 6:48 ` [meta-virtualization][PATCH 2/2] sloci-image: set CLEANBROKEN = 1 hongxu
@ 2020-09-21 21:32 ` Bruce Ashfield
0 siblings, 0 replies; 4+ messages in thread
From: Bruce Ashfield @ 2020-09-21 21:32 UTC (permalink / raw)
To: Hongxu Jia; +Cc: meta-virtualization
Adjusted for me not merging the recipe name change .. and merged.
Bruce
In message: [meta-virtualization][PATCH 2/2] sloci-image: set CLEANBROKEN = 1
on 15/09/2020 Hongxu Jia wrote:
> Workaround rebuild failure
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
> recipes-containers/sloci-image/sloci-image_git.bb | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/recipes-containers/sloci-image/sloci-image_git.bb b/recipes-containers/sloci-image/sloci-image_git.bb
> index 30fa4c1..fc3c329 100644
> --- a/recipes-containers/sloci-image/sloci-image_git.bb
> +++ b/recipes-containers/sloci-image/sloci-image_git.bb
> @@ -22,4 +22,6 @@ do_install() {
> make PREFIX="${exec_prefix}" DESTDIR=${D} install
> }
>
> +CLEANBROKEN = "1"
> +
> BBCLASSEXTEND = "native nativesdk"
> --
> 2.18.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-21 21:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-15 6:48 [meta-virtualization][PATCH 1/2] skopeo: upgrade to 1.1.1 hongxu
2020-09-15 6:48 ` [meta-virtualization][PATCH 2/2] sloci-image: set CLEANBROKEN = 1 hongxu
2020-09-21 21:32 ` Bruce Ashfield
2020-09-15 11:45 ` [meta-virtualization][PATCH 1/2] skopeo: upgrade to 1.1.1 Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.