commit: fb727d4682050371a490986c16ba0978a790ad50 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> AuthorDate: Sun Jul 16 11:36:29 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sun Jul 16 11:41:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb727d46
app-containers/distrobuilder: add 2.1 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> app-containers/distrobuilder/Manifest | 2 + .../distrobuilder/distrobuilder-2.1.ebuild | 51 ++++++++++++++++++++++ .../files/distrobuilder-2.1-glibc-2.36-fix.patch | 34 +++++++++++++++ app-containers/distrobuilder/metadata.xml | 3 ++ 4 files changed, 90 insertions(+) diff --git a/app-containers/distrobuilder/Manifest b/app-containers/distrobuilder/Manifest index 1f52353798fa..fc43bd496cfd 100644 --- a/app-containers/distrobuilder/Manifest +++ b/app-containers/distrobuilder/Manifest @@ -1,2 +1,4 @@ DIST distrobuilder-2.0-deps.tar.xz 368438228 BLAKE2B 511e57d20b6d7be469e005a97cca073dc2c6bd67da550c17adb8f37e40c4cf74357da48f73dcf081eee7530d10857c006b82f5444813044eee8ec60f72e61046 SHA512 d7bdaacf5e1d106f3beac4d338c587e48373dc0fc7926670699fc9ca7cd4bb2e102268988c506361bec57610b3e9d3a287a70168adf5bf9f62f797742cdeac27 DIST distrobuilder-2.0.tar.gz 179411 BLAKE2B bc008edc05f3e89872de87711cb51dd0797e93c03cbd2a077f43d4f1c28a1f14984c42f7181fc9c5501d96667e159ef263a92f43e20484534d47c64af88e85fa SHA512 3b85a992893689232f55b7cedbf2617fde95cf0af053424a585040781df592cd1f34800fe43bc5eb37e3740fea921ca9893b749fd280132794dc77f0ca4d9934 +DIST distrobuilder-2.1.tar.gz 5599048 BLAKE2B 90e82a20a3ef61d13148951956bb1f74cc3494ca86e339c188a1c9009dcb27c0cb9a298c639c6de891df67915b48d107557f6b698a45cbe35c54d41a45bac1ab SHA512 80184d27305f5659f1367563161220b966b1957810da61e8f3b9f32cf408795319b43dd650bc9f867b3ac73ef2b3251972bb11999d92feb34bfd9cdae7ff7b7b +DIST distrobuilder-2.1.tar.gz.asc 833 BLAKE2B fb3aadbc989438b0606c88e74fdd86e809b6373b907b37372cbbc0ca99415821f61772205967e0a7aa26b0bdaceb66df4ab39da1f08c339edeb84e66a04aab56 SHA512 0220fa34d966e2b3a244af21a894f5db7556b891ee3205b605ef633699553f0f53d876412c855010a0ef685fcfe376997790cf51d59fd46b7c9ba539507de4e3 diff --git a/app-containers/distrobuilder/distrobuilder-2.1.ebuild b/app-containers/distrobuilder/distrobuilder-2.1.ebuild new file mode 100644 index 000000000000..88ab03786eb3 --- /dev/null +++ b/app-containers/distrobuilder/distrobuilder-2.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module linux-info + +DESCRIPTION="System container image builder for LXC and LXD" +HOMEPAGE="https://linuxcontainers.org/distrobuilder/introduction/"; + +SRC_URI="https://linuxcontainers.org/downloads/distrobuilder/distrobuilder-${PV}.tar.gz + verify-sig? ( https://linuxcontainers.org/downloads/distrobuilder/distrobuilder-${PV}.tar.gz.asc )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc64" +IUSE="verify-sig" + +RDEPEND="app-crypt/gnupg + dev-util/debootstrap + dev-vcs/git + net-misc/rsync + sys-fs/squashfs-tools" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )" + +# Test deps aren't vendored. +RESTRICT="test" + +CONFIG_CHECK="~OVERLAY_FS" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc + +PATCHES=( "${FILESDIR}"/distrobuilder-2.1-glibc-2.36-fix.patch ) + +GOPATH="${S}/_dist" + +src_compile() { + export GOPATH="${S}/_dist" + emake +} + +src_test() { + export GOPATH="${S}/_dist" + emake check +} + +src_install() { + export GOPATH="${S}/_dist" + dobin ${GOPATH}/bin/distrobuilder + dodoc -r doc/* +} diff --git a/app-containers/distrobuilder/files/distrobuilder-2.1-glibc-2.36-fix.patch b/app-containers/distrobuilder/files/distrobuilder-2.1-glibc-2.36-fix.patch new file mode 100644 index 000000000000..5fd5ade014bb --- /dev/null +++ b/app-containers/distrobuilder/files/distrobuilder-2.1-glibc-2.36-fix.patch @@ -0,0 +1,34 @@ +diff --git a/vendor/github.com/lxc/lxd/lxd/include/syscall_wrappers.h b/vendor/github.com/lxc/lxd/lxd/include/syscall_wrappers.h +index 2c28133a8..a6975ab4d 100644 +--- a/vendor/github.com/lxc/lxd/lxd/include/syscall_wrappers.h ++++ b/vendor/github.com/lxc/lxd/lxd/include/syscall_wrappers.h +@@ -26,10 +26,10 @@ static inline int lxd_close_range(unsigned int fd, unsigned int max_fd, unsigned + return syscall(__NR_close_range, fd, max_fd, flags); + } + +-static inline int open_tree(int dfd, const char *filename, unsigned int flags) ++/* static inline int open_tree(int dfd, const char *filename, unsigned int flags) + { + return syscall(__NR_open_tree, dfd, filename, flags); +-} ++}*/ + + /* + * mount_setattr() +@@ -40,7 +40,7 @@ struct lxc_mount_attr { + __u64 propagation; + __u64 userns_fd; + }; +- ++/* + static inline int mount_setattr(int dfd, const char *path, unsigned int flags, + struct lxc_mount_attr *attr, size_t size) + { +@@ -53,6 +53,7 @@ static inline int move_mount(int from_dfd, const char *from_pathname, int to_dfd + return syscall(__NR_move_mount, from_dfd, from_pathname, to_dfd, + to_pathname, flags); + } ++*/ + + /* arg1 of prctl() */ + #ifndef PR_SCHED_CORE diff --git a/app-containers/distrobuilder/metadata.xml b/app-containers/distrobuilder/metadata.xml index dfdfc1731f80..5a061dc2f595 100644 --- a/app-containers/distrobuilder/metadata.xml +++ b/app-containers/distrobuilder/metadata.xml @@ -13,4 +13,7 @@ <email>[email protected]</email> <name>Gentoo Virtualization Project</name> </maintainer> + <upstream> + <remote-id type="github">lxc/distrobuilder</remote-id> + </upstream> </pkgmetadata>
