From 07c4520cef1de325e7505409c01f81f317cb8f7f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 14 Feb 2021 23:35:45 +0100 Subject: [PATCH] rkt: remove package closes #28554 --- srcpkgs/removed-packages/template | 5 +- srcpkgs/rkt-stage1-coreos | 1 - srcpkgs/rkt-stage1-fly | 1 - srcpkgs/rkt/files/rkt-gc | 2 - srcpkgs/rkt/files/rkt-metadata/run | 2 - srcpkgs/rkt/patches/musl-accessperms.patch | 13 ---- srcpkgs/rkt/template | 88 ---------------------- 7 files changed, 4 insertions(+), 108 deletions(-) delete mode 120000 srcpkgs/rkt-stage1-coreos delete mode 120000 srcpkgs/rkt-stage1-fly delete mode 100644 srcpkgs/rkt/files/rkt-gc delete mode 100644 srcpkgs/rkt/files/rkt-metadata/run delete mode 100644 srcpkgs/rkt/patches/musl-accessperms.patch delete mode 100644 srcpkgs/rkt/template diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 7a0618cf3a6..6be7dcd6f18 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=25 +revision=26 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -212,6 +212,9 @@ replaces=" qt-qmake<=4.8.7_29 r2-bindings<=1.0.1_2 reminiscence<=0.4.6_1 + rkt<=1.30.0_3 + rkt-stage1-fly<=1.30.0_3 + rkt-stage1-coreos<=1.30.0_3 scantailor<=0.9.12.1_2 seriespl<=2.3.5_2 simple-obfs<=0.0.5_2 diff --git a/srcpkgs/rkt-stage1-coreos b/srcpkgs/rkt-stage1-coreos deleted file mode 120000 index 9572e0e83de..00000000000 --- a/srcpkgs/rkt-stage1-coreos +++ /dev/null @@ -1 +0,0 @@ -rkt \ No newline at end of file diff --git a/srcpkgs/rkt-stage1-fly b/srcpkgs/rkt-stage1-fly deleted file mode 120000 index 9572e0e83de..00000000000 --- a/srcpkgs/rkt-stage1-fly +++ /dev/null @@ -1 +0,0 @@ -rkt \ No newline at end of file diff --git a/srcpkgs/rkt/files/rkt-gc b/srcpkgs/rkt/files/rkt-gc deleted file mode 100644 index 3cdbb011601..00000000000 --- a/srcpkgs/rkt/files/rkt-gc +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -rkt gc --grace-period=24h diff --git a/srcpkgs/rkt/files/rkt-metadata/run b/srcpkgs/rkt/files/rkt-metadata/run deleted file mode 100644 index af03ab826d7..00000000000 --- a/srcpkgs/rkt/files/rkt-metadata/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec rkt metadata-service diff --git a/srcpkgs/rkt/patches/musl-accessperms.patch b/srcpkgs/rkt/patches/musl-accessperms.patch deleted file mode 100644 index a7a04475429..00000000000 --- a/srcpkgs/rkt/patches/musl-accessperms.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- rkt-1.25.0/stage1/prepare-app/prepare-app.c 2017-02-20 11:16:05.000000000 +0100 -+++ rkt-1.25.0/stage1/prepare-app/prepare-app.c 2017-03-06 00:55:19.536542504 +0100 -@@ -27,6 +27,10 @@ - #include - #include - -+#if !defined(ACCESSPERMS) -+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ -+#endif -+ - #define err_out(_fmt, _args...) \ - fprintf(stderr, "Error: " _fmt "\n", ##_args); - static int exit_err; diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template deleted file mode 100644 index 84d4e32837a..00000000000 --- a/srcpkgs/rkt/template +++ /dev/null @@ -1,88 +0,0 @@ -# Template file for 'rkt' -pkgname=rkt -version=1.30.0 -revision=2 -build_style=gnu-configure -# KVM support broken -configure_args="--enable-tpm=no --enable-sdjournal=no - --with-stage1-flavors=fly,coreos,host - --with-stage1-default-location=/usr/lib/rkt/stage1.aci" -hostmakedepends="automake wget cpio squashfs-tools bc gnupg git go" -makedepends="acl-devel zlib-devel libressl-devel" -depends="virtual?rkt-stage1" -short_desc="App Container runtime for Linux" -maintainer="Andrea Brancaleoni " -license="Apache-2.0" -homepage="https://github.com/coreos/rkt" -distfiles="https://github.com/coreos/rkt/archive/v${version}.tar.gz" -checksum=4d22c742b87d15c226cc28970c7daf66a64c6a95af9d752f5b72d9a4012aca1d - -patch_args="-Np1" -nopie=yes - -system_groups="rkt" - -nocross=yes - -archs="x86_64*" - -make_dirs="/var/lib/rkt 2750 root rkt - /var/lib/rkt/tmp 2750 root rkt - /var/lib/rkt/cas 2770 root rkt - /var/lib/rkt/cas/db 2770 root rkt - /var/lib/rkt/cas/imagelocks 2770 root rkt - /var/lib/rkt/cas/imageManifest 2770 root rkt - /var/lib/rkt/cas/blob 2770 root rkt - /var/lib/rkt/cas/tmp 2770 root rkt - /var/lib/rkt/cas/tree 2700 root rkt - /var/lib/rkt/cas/treestorelocks 2700 root rkt - /var/lib/rkt/locks 2750 root rkt - /var/lib/rkt/pods 2750 root rkt - /var/lib/rkt/pods/embryo 2750 root rkt - /var/lib/rkt/pods/prepare 2750 root rkt - /var/lib/rkt/pods/prepared 2750 root rkt - /var/lib/rkt/pods/run 2750 root rkt - /var/lib/rkt/pods/exited-garbage 2750 root rkt - /var/lib/rkt/pods/garbage 2750 root rkt" - -pre_configure() { - rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch - ./autogen.sh -} - -do_install() { - vsv rkt-metadata - - vinstall ${FILESDIR}/rkt-gc 755 etc/cron.daily - - vbin build-${pkgname}-${version}/target/bin/rkt - vbin build-${pkgname}-${version}/tools/actool -} - -rkt-stage1-fly_package() { - alternatives="rkt-stage1:/usr/lib/rkt/stage1.aci:/usr/lib/rkt/stage1-fly.aci" - short_desc+=" - fly stage1" - provides="rkt-stage1-${version}_${revision}" - pkg_install() { - vinstall build-${sourcepkg}-${version}/target/bin/stage1-fly.aci 644 usr/lib/rkt - } -} - -#rkt-stage1-kvm_package() { -# alternatives="rkt-stage1:/usr/lib/rkt/stage1.aci:/usr/lib/rkt/stage1-kvm.aci" -# depends="${sourcepkg}>=${version}_${revision}" -# short_desc+=" - kvm stage1" -# provides="rkt-stage1-${version}_${revision}" -# pkg_install() { -# vinstall build-${sourcepkg}-${version}/target/bin/stage1-kvm.aci 644 usr/lib/rkt -# } -#} - -rkt-stage1-coreos_package() { - alternatives="rkt-stage1:/usr/lib/rkt/stage1.aci:/usr/lib/rkt/stage1-coreos.aci" - short_desc+=" - coreos stage1" - provides="rkt-stage1-${version}_${revision}" - pkg_install() { - vinstall build-${sourcepkg}-${version}/target/bin/stage1-coreos.aci 644 usr/lib/rkt - } -}