Message ID | 20220109210607.2270978-1-romain.naour@smile.fr |
---|---|
State | Accepted |
Headers | show |
Series | [v2] package/moby-buildkit: new package | expand |
On 09/01/2022 22:06, Romain Naour wrote: > From: Christian Stewart <christian@paral.in> > > Signed-off-by: Christian Stewart <christian@paral.in> > [Romain: > - remove host-pkgconf dependency > - Add the license file hash > - Fix the check-package warning in Config.in] > Signed-off-by: Romain Naour <romain.naour@smile.fr> Applied to master, thanks. I also added Christian to DEVELOPERS. Regards, Arnout > --- > > The license file hash was a copy past error. > The 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 belong to > balena-engine package from [1] > > [1] https://git.buildroot.net/buildroot/commit/?id=cb0d87004c824dc6bb421fe8316428d51e1335bd > --- > package/Config.in | 1 + > package/moby-buildkit/Config.in | 19 +++++++++++++++++++ > package/moby-buildkit/moby-buildkit.hash | 3 +++ > package/moby-buildkit/moby-buildkit.mk | 22 ++++++++++++++++++++++ > 4 files changed, 45 insertions(+) > create mode 100644 package/moby-buildkit/Config.in > create mode 100644 package/moby-buildkit/moby-buildkit.hash > create mode 100644 package/moby-buildkit/moby-buildkit.mk > > diff --git a/package/Config.in b/package/Config.in > index edae7e4f62..7bf17f486e 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2554,6 +2554,7 @@ menu "System tools" > source "package/mender/Config.in" > source "package/mender-grubenv/Config.in" > source "package/mfoc/Config.in" > + source "package/moby-buildkit/Config.in" > source "package/monit/Config.in" > source "package/multipath-tools/Config.in" > source "package/ncdu/Config.in" > diff --git a/package/moby-buildkit/Config.in b/package/moby-buildkit/Config.in > new file mode 100644 > index 0000000000..93c852bcdb > --- /dev/null > +++ b/package/moby-buildkit/Config.in > @@ -0,0 +1,19 @@ > +config BR2_PACKAGE_MOBY_BUILDKIT > + bool "moby-buildkit" > + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS > + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on !BR2_TOOLCHAIN_USES_UCLIBC > + depends on BR2_USE_MMU > + select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency > + help > + BuildKit is a toolkit for converting source code to build > + artifacts in an efficient, expressive and repeatable manner. > + > + https://github.com/moby/buildkit > + > +comment "moby-buildkit needs a glibc or musl toolchain w/ threads" > + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS > + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS > + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC > + depends on BR2_USE_MMU > diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash > new file mode 100644 > index 0000000000..3015e479f6 > --- /dev/null > +++ b/package/moby-buildkit/moby-buildkit.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz > +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE > diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk > new file mode 100644 > index 0000000000..3f0df351ef > --- /dev/null > +++ b/package/moby-buildkit/moby-buildkit.mk > @@ -0,0 +1,22 @@ > +################################################################################ > +# > +# moby-buildkit > +# > +################################################################################ > + > +MOBY_BUILDKIT_VERSION = 0.8.1 > +MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) > +MOBY_BUILDKIT_LICENSE = Apache-2.0 > +MOBY_BUILDKIT_LICENSE_FILES = LICENSE > + > +MOBY_BUILDKIT_GOMOD = github.com/moby/buildkit > + > +MOBY_BUILDKIT_TAGS = cgo > +MOBY_BUILDKIT_BUILD_TARGETS = cmd/buildctl cmd/buildkitd > + > +MOBY_BUILDKIT_LDFLAGS = \ > + -X $(MOBY_BUILDKIT_GOMOD)/version.Version="$(MOBY_BUILDKIT_VERSION)" > + > +MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(MOBY_BUILDKIT_BUILD_TARGETS)) > + > +$(eval $(golang-package)) >
diff --git a/package/Config.in b/package/Config.in index edae7e4f62..7bf17f486e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2554,6 +2554,7 @@ menu "System tools" source "package/mender/Config.in" source "package/mender-grubenv/Config.in" source "package/mfoc/Config.in" + source "package/moby-buildkit/Config.in" source "package/monit/Config.in" source "package/multipath-tools/Config.in" source "package/ncdu/Config.in" diff --git a/package/moby-buildkit/Config.in b/package/moby-buildkit/Config.in new file mode 100644 index 0000000000..93c852bcdb --- /dev/null +++ b/package/moby-buildkit/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_MOBY_BUILDKIT + bool "moby-buildkit" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_USE_MMU + select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency + help + BuildKit is a toolkit for converting source code to build + artifacts in an efficient, expressive and repeatable manner. + + https://github.com/moby/buildkit + +comment "moby-buildkit needs a glibc or musl toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_USE_MMU diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash new file mode 100644 index 0000000000..3015e479f6 --- /dev/null +++ b/package/moby-buildkit/moby-buildkit.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk new file mode 100644 index 0000000000..3f0df351ef --- /dev/null +++ b/package/moby-buildkit/moby-buildkit.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# moby-buildkit +# +################################################################################ + +MOBY_BUILDKIT_VERSION = 0.8.1 +MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) +MOBY_BUILDKIT_LICENSE = Apache-2.0 +MOBY_BUILDKIT_LICENSE_FILES = LICENSE + +MOBY_BUILDKIT_GOMOD = github.com/moby/buildkit + +MOBY_BUILDKIT_TAGS = cgo +MOBY_BUILDKIT_BUILD_TARGETS = cmd/buildctl cmd/buildkitd + +MOBY_BUILDKIT_LDFLAGS = \ + -X $(MOBY_BUILDKIT_GOMOD)/version.Version="$(MOBY_BUILDKIT_VERSION)" + +MOBY_BUILDKIT_INSTALL_BINS = $(notdir $(MOBY_BUILDKIT_BUILD_TARGETS)) + +$(eval $(golang-package))