diff --git a/66 b/66 new file mode 120000 index 0000000..eca9371 --- /dev/null +++ b/66 @@ -0,0 +1 @@ +obarun/66 \ No newline at end of file diff --git a/66-tools b/66-tools new file mode 120000 index 0000000..82cfecc --- /dev/null +++ b/66-tools @@ -0,0 +1 @@ +obarun/66-tools \ No newline at end of file diff --git a/66/66.install b/66/66.install deleted file mode 100644 index 71a243c..0000000 --- a/66/66.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - if ! getent group log >/dev/null; then - groupadd -r -g 19 log - fi - - if ! getent passwd s6log >/dev/null; then - useradd -u 19 -g 19 -d / -c "S6 log user" -s /usr/bin/nologin s6log - fi -} - -post_upgrade() { - - post_install - printf "%s\n" "==> WARNING: According to the skarnet recommendations about the s6-svscan and skalibs library changes, you need to reboot after your 66 package upgrade." -} diff --git a/66/PKGBUILD b/66/PKGBUILD deleted file mode 100644 index 5639b85..0000000 --- a/66/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/bash -# JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname" -#-----------------------------------------| DESCRIPTION |--------------------------------------- - -pkgname=66 -pkgver=0.6.2.0 -pkgrel=01 -pkgdesc="Small tools built around s6 and s6-rc programs" -url='https://framagit.org/Obarun/66.git' -source=("${pkgname}::git+${url}#tag=v$pkgver" - 66.install ) -# direct: https://git.obarun.org/pkg/obcore/66/-/raw/master/trunk/66.install - -makedepends=('git' 'skalibs>=2.11.0.0' 'execline>=2.8.1.0' 's6>=2.11.0.0' 's6-rc>=0.5.2.3' 'oblibs>=0.1.4.0' 'lowdown' 'linux-api-headers') -depends=('skalibs>=2.11.0.0' 'execline>=2.8.1.0' 's6>=2.11.0.0' 's6-rc>=0.5.2.3' 'oblibs>=0.1.4.0') -arch=(x86_64) - -backup=('etc/66/init.conf' - 'etc/66/rc.init' - 'etc/66/rc.init.container' - 'etc/66/rc.shutdown' - 'etc/66/rc.shutdown.final' - 'usr/bin/init') - -conflicts=('s6-linux-init') - -groups=('s6-suite') - -install=66.install - -build() { - cd $pkgname - ./configure --bindir=/usr/bin \ - --shebangdir=/usr/bin \ - --with-system-service=/usr/lib/66/service \ - --with-system-module=/usr/lib/66/module \ - --with-system-script=/usr/lib/66/script \ - --with-s6-log-timestamp=iso \ - --with-s6-log-user=s6log \ - --with-lib=/usr/lib/skalibs \ - --with-lib=/usr/lib/execline \ - --with-lib=/usr/lib/s6 \ - --with-lib=/usr/lib/s6-rc \ - --with-lib=/usr/lib/oblibs \ - --disable-shared - make -} - -package() { - cd $pkgname - - make DESTDIR="$pkgdir" install - - ## move wrapper at the correct place - mv "$pkgdir"/etc/66/init "$pkgdir"/usr/bin - mkdir -p "$pkgdir"/usr/bin/s6 - mv "$pkgdir"/etc/66/{halt,poweroff,reboot,shutdown} "$pkgdir"/usr/bin/s6 - install -Dm 0644 LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE -} - -#---- license gpg-key sha256sums ---- - -license=(ISC) - -sha256sums=(SKIP - a8ccf4276e7ccedbc32244e50e0df802c81cb8ef13b18a6e214e9ddae15dd2c3) # 66.install diff --git a/66/PKGBUILD-oba b/66/PKGBUILD-oba deleted file mode 100644 index 05fdae0..0000000 --- a/66/PKGBUILD-oba +++ /dev/null @@ -1,117 +0,0 @@ -# Distribution : Obarun S6/66 -#----------------------------- -# Maintainer : Eric Vidal -# Maintainer : Jean-Michel T.Dydak -#---------------- -# Obarun PkgSrc : https://git.obarun.org/pkg/obcore/66 -#-------------------------------------------------------------------------------- -# DESCRIPTION ] - -pkgname=66 -pkgver=0.6.2.0 -pkgrel=1 -pkgdesc="Small tools built around s6 and s6-rc programs" - -url='https://framagit.org/Obarun/66.git' - -track="tag" -target="v$pkgver" -source=( - "${pkgname}::git+${url}#${track}=${target}" -) - -#---------------------- -# BUILD CONFIGURATION ] - -makedepends=( - 'git' - 'skalibs>=2.11.0.0' - 'execline>=2.8.1.0' - 's6>=2.11.0.0' - 's6-rc>=0.5.2.3' - 'oblibs>=0.1.4.0' - 'lowdown' - 'linux-api-headers' -) - -#------------------------ -# INSTALL CONFIGURATION ] - -depends=( - 'skalibs>=2.11.0.0' - 'execline>=2.8.1.0' - 's6>=2.11.0.0' - 's6-rc>=0.5.2.3' - 'oblibs>=0.1.4.0' -) - -backup=( - 'etc/66/init.conf' - 'etc/66/rc.init' - 'etc/66/rc.init.container' - 'etc/66/rc.shutdown' - 'etc/66/rc.shutdown.final' - 'usr/bin/init' -) - -conflicts=( - 's6-linux-init' -) - -groups=( - 'base' - 's6-suite' -) - -install=66.install - -#---------------- -# BUILD CONTROL ] - -_flags=( - --bindir=/usr/bin - --shebangdir=/usr/bin - --with-system-service=/usr/lib/66/service - --with-system-module=/usr/lib/66/module - --with-system-script=/usr/lib/66/script - --with-s6-log-timestamp=iso - --with-s6-log-user=s6log - --with-lib=/usr/lib/skalibs - --with-lib=/usr/lib/execline - --with-lib=/usr/lib/s6 - --with-lib=/usr/lib/s6-rc - --with-lib=/usr/lib/oblibs - --disable-shared -) - -#-------- -# BUILD ] - -build() { - cd $pkgname - - ./configure "${_flags[@]}" - make -} - -#---------- -# PACKAGE ] - -package() { - cd $pkgname - - make DESTDIR="$pkgdir" install - - ## move wrapper at the correct place - mv "$pkgdir"/etc/66/{halt,init,poweroff,reboot,shutdown} "$pkgdir"/usr/bin - - install -Dm 0644 LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE -} - -#-------------------- -# ARCH LICENSE AUTH ] - -arch=(x86_64) -license=(ISC) - -sha512sums=('') diff --git a/66/clean b/66/clean deleted file mode 100644 index 63747e3..0000000 --- a/66/clean +++ /dev/null @@ -1 +0,0 @@ -rm -rvf {src,pkg,66} diff --git a/66/deps b/66/deps deleted file mode 100644 index 6472eea..0000000 --- a/66/deps +++ /dev/null @@ -1,12 +0,0 @@ -skalibs -execline -s6 -s6-rc -oblibs -skalibs -execline -s6 -s6-rc -oblibs -lowdown -git diff --git a/66/time b/66/time deleted file mode 100644 index 0d2308b..0000000 --- a/66/time +++ /dev/null @@ -1,4 +0,0 @@ - -real 0m22.586s -user 0m23.507s -sys 0m2.132s diff --git a/boot-66serv b/boot-66serv new file mode 120000 index 0000000..8d3ec9e --- /dev/null +++ b/boot-66serv @@ -0,0 +1 @@ +obarun/boot-66serv \ No newline at end of file diff --git a/boot-66serv/PKGBUILD b/boot-66serv/PKGBUILD deleted file mode 100644 index 3db8c4c..0000000 --- a/boot-66serv/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/bash -# JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname" -# Website : https://pozol.eu -#-----------------------------------------| DESCRIPTION |--------------------------------------- - -pkgname=boot-66serv -pkgdesc="Complete and portable set of services to properly boot a machine with 66 tools" -pkgver=2.4.1 -pkgrel=04 -arch=('x86_64') -url="https://git.obarun.org/obmods/${pkgname}" -source=("${pkgname}::git+${url}#tag=v${pkgver}" - boot.install) - -makedepends=('git') - -build() { - cd "${pkgbase}" - ./configure \ - --bindir=/usr/bin \ - --with-system-service=/usr/lib/66/service \ - --with-system-module=/usr/lib/66/module \ - --with-system-script=/usr/lib/66/script -} - -package() { - cd "${pkgbase}" - make DESTDIR="${pkgdir}" install -} - -install=boot.install - -groups=('s6-suite') - -backup=('etc/66/rc.local') - -depends=( '66>=0.6.1.3' - '66-tools>=0.0.7.3' - 's6-linux-utils' - 's6-portable-utils' - 'util-linux' - 'iproute2' - 'kmod' - 'opentmpfiles' - 'obsysusers' - 'modules' - 'iptables') # Obarun has this as optional but it is part of base and boot crashes without it - -optdepends=('nftables: nftables support' - 'ebtables: ebtables support' - 'arptables: arptables support' - 'dmraid: dmraid support' - 'lvm2: lvm support' - 'btrfs-progs: btrfs support' - 'cryptsetup: encryption support') - -#---- license gpg-key sha256sums ---- - -license=('0BSD') - -sha256sums=(SKIP - f7e81047005998f6db00c187835c9aa3248d73c2f50b97617e48851825f65ad6) # boot.install diff --git a/boot-66serv/PKGBUILD-oba b/boot-66serv/PKGBUILD-oba deleted file mode 100644 index 46331e2..0000000 --- a/boot-66serv/PKGBUILD-oba +++ /dev/null @@ -1,92 +0,0 @@ -# Obarun : 66 init/supervisor -# Maintainer : Eric Vidal -# Maintainer : Jean-Michel T.Dydak -# PkgSource : url="https://git.obarun.org/pkg/observice/boot-66serv" -#----------------------------------------------------------------------------------------------- - -#-----------------------------------------| DESCRIPTION |--------------------------------------- - -pkgbase=boot-66serv -pkgname=boot@-66serv - -pkgdesc="Complete and portable set of services to properly boot a machine with 66 tools" - -pkgver=2.4.1 -pkgrel=2 - -url="https://git.obarun.org/obmods/${pkgbase}" - -track="tag" -target="v${pkgver}" -source=("${pkgbase}::git+${url}#${track}=${target}") - -#-------------------------------------| BUILD CONFIGURATION |----------------------------------- - -makedepends=( - 'git') - -#--------------------------------------------| BUILD |------------------------------------------- - -build() { - cd "${pkgbase}" - - ./configure \ - --bindir=/usr/bin \ - --with-system-service=/usr/lib/66/service \ - --with-system-module=/usr/lib/66/module \ - --with-system-script=/usr/lib/66/script -} - -#-------------------------------------------| PACKAGE |------------------------------------------ - -package() { - cd "${pkgbase}" - - make DESTDIR="${pkgdir}" install -} - -#------------------------------------| INSTALL CONFIGURATION |---------------------------------- - -arch=('x86_64') - -install=boot.install - -groups=( - 'base' - 's6-suite') - -backup=( - 'etc/66/rc.local') - -depends=( - '66>=0.6.1.3' - '66-tools>=0.0.7.3' - 's6-linux-utils' - 's6-portable-utils' - 'util-linux' - 'iproute2' - 'kmod' - 'opentmpfiles' - 'modules') - -optdepends=( - 'iptables: iptables support' - 'nftables: nftables support' - 'ebtables: ebtables support' - 'arptables: arptables support' - 'dmraid: dmraid support' - 'lvm2: lvm support' - 'btrfs-progs: btrfs support' - 'zfs: zfs support' - 'cryptsetup: encryption support') - -replaces=('boot-66serv') - -conflicts=('boot-66serv') - -provides=('boot-66serv') - -#-------------------------------------| SECURITY AND LICENCE |---------------------------------- - -sha512sums=('SKIP') -license=('0BSD') diff --git a/boot-66serv/boot.install b/boot-66serv/boot.install deleted file mode 100644 index 2787c75..0000000 --- a/boot-66serv/boot.install +++ /dev/null @@ -1,8 +0,0 @@ -post_install() { - 66-yeller -zcp boot@ -W Please enable again your boot@sys service by using the following command as root %rbefore rebooting%n: - 66-yeller -zicp boot@ " %w66-enable -t boot -F boot@sys%n" -} - -post_upgrade() { - post_install -} diff --git a/boot-66serv/clean b/boot-66serv/clean deleted file mode 100644 index 3fe1a13..0000000 --- a/boot-66serv/clean +++ /dev/null @@ -1 +0,0 @@ -rm -rvf {src,pkg,boot-66serv} diff --git a/boot-66serv/deps b/boot-66serv/deps deleted file mode 100644 index 2127fea..0000000 --- a/boot-66serv/deps +++ /dev/null @@ -1,9 +0,0 @@ -66 -66-tools -s6-linux-utils -s6-portable-utils -opentmpfiles -modules -git -boot@-66serv -obsysusers diff --git a/boot-66serv/time b/boot-66serv/time deleted file mode 100644 index 224f7bd..0000000 --- a/boot-66serv/time +++ /dev/null @@ -1,3 +0,0 @@ -real 0m3.091s -user 0m2.468s -sys 0m0.357s