dot

packages and services management
Log | Files | Refs | README

commit 2a681c3e340828b11bfee65a343cf53c28d4b02f
parent 0812b6ab53f3697726458b88e723b7f654b71255
Author: Josuah Demangeon <josuah.demangeon@gandi.net>
Date:   Sun, 27 Aug 2017 23:35:06 +0200

ROOT -> SYSROOT

And further cleanups

Diffstat:
Mdma/build | 10+++++-----
Dgit/git-index.1 | 76----------------------------------------------------------------------------
Mlibtox/build | 10+++++-----
Alinux/build | 29+++++++++++++++++++++++++++++
Rsystem/linux/crusoe-nopl-emu.patch -> linux/crusoe-nopl-emu.patch | 0
Rsystem/linux/kconfig.sabotage -> linux/kconfig.sabotage | 0
Rsystem/linux/lastversion.sh -> linux/lastversion.sh | 0
Rsystem/linux/patch.sh -> linux/patch.sh | 0
Rsystem/linux/source.sh -> linux/source.sh | 0
Rsystem/linux/version -> linux/version | 0
Mmbsync/build | 2+-
Mmpop/build | 8++++----
Mngircd/build | 14+++++++-------
Dngircd/crash | 1-
Dngircd/ngircd.conf | 123-------------------------------------------------------------------------------
Dngircd/ngircd.motd | 11-----------
Mopentracker/build | 4++--
Arsync/build | 12++++++++++++
Drsync/build.sh | 13-------------
Drsync/lastversion.sh | 2--
Drsync/patch.sh | 2--
Drsync/source.sh | 2--
Arsync/tar | 1+
Drsync/version | 1-
Mrunit/build | 8+++++---
Dscron/crash | 1-
Mstunnel/build | 2+-
Dsystem/linux/build.sh | 27---------------------------
28 files changed, 72 insertions(+), 287 deletions(-)

diff --git a/dma/build b/dma/build @@ -1,12 +1,12 @@ -mkdir -p "$PREFIX/bin" "$PREFIX/share/man/man8" "$ROOT/var/spool/dma" +mkdir -p "$PREFIX/bin" "$PREFIX/share/man/man8" "$SYSROOT/var/spool/dma" case "$(uname)" in (*BSD ) cd bsd ;; esac make PREFIX="$PREFIX" \ - CONFDIR="$ROOT/pkg/dma" \ - VAR="$ROOT/var" \ - CFLAGS+="-I$ROOT/include" \ - LDFLAGS+="-L$ROOT/lib" + CONFDIR="$SYSROOT/pkg/dma" \ + VAR="$SYSROOT/var" \ + CFLAGS+="-I$SYSROOT/include" \ + LDFLAGS+="-L$SYSROOT/lib" case "$(uname)" in (*BSD) diff --git a/git/git-index.1 b/git/git-index.1 @@ -1,76 +0,0 @@ -.Dd mar 23, 2017 -.Dt GIT-INDEX -.Os -. -. -.Sh NAME -. -.Nm git-index -.Nd generate static website with the git command -. -. -.Sh SYNOPSIS -. -.Nm -.Ar repository -.Op Ar description -. -. -.Sh DESCRIPTION -. -The -.Nm -script creates a static website presenting the files and commits of a git -repository. The build is incremential so that it can be triggered at every -commit without large overhead. -. -.Pp -. -It only requires -.Xr 1 git -command to produce the output, and the various. -. -.Pp -. -The first argument is treated as a path to a repository. -. -. -.Sh FILES -. -.Bl -tag -width indent -. -.It Pa ./style.css Ns , Pa ./favicon.png -These ressources will be used in the html -.Li <head> -element. -. -. -.It Pa ./repository/index.html -An -.Pa index.html -file will be created in the repository directory, containing a list of -the files and the commits. -. -.It Pa ./repository/commit/4279dbc3735e1e38bf33120c9234640d99fee650.html -One html page per commit is created. -. -.It Pa ./repository/file/path/to/the/file -The file content of the -. -.El -. -. -.Sh EXAMPLES -. -A script generating an index of multiple repositories might look like this: -.Bd -literal -offset indent -printf '<!doctype html>\\n<html>\\n<body>\\n<ul>\\n' > ./index.html - -printf '<li><a href="">%s</a></li>\n' git/repo1 repo1 >> index.html -git-index /path/to/repo1 - -printf '<li><a href="">%s</a></li>\n' git/repo2 repo2 >> index.html -git-index /path/to/repo2 - -printf '</ul>\\n</body>\\n</html>\\n' >> index.html -.Ed diff --git a/libtox/build b/libtox/build @@ -1,8 +1,8 @@ -export OPUS_CFLAGS="-I$ROOT/include/opus" -export VPX_CFLAGS="-I$ROOT/include" -export OPUS_LIBS="-L$ROOT/lib" -export VPX_LIBS="-L$ROOT/lib" +export OPUS_CFLAGS="-I$SYSROOT/include/opus" +export VPX_CFLAGS="-I$SYSROOT/include" +export OPUS_LIBS="-L$SYSROOT/lib" +export VPX_LIBS="-L$SYSROOT/lib" -./configure --prefix="$PREFIX" --with-dependency-search="$ROOT" +./configure --prefix="$PREFIX" --with-dependency-search="$SYSROOT" make install diff --git a/linux/build b/linux/build @@ -0,0 +1,29 @@ +#!/bin/sh +set -e + +ARCH="$($CC -dumpmachine | cut '-d-' -f1 | sed 's/i[3-6]86/i386/')" + +case $ARCH in +(i386 | x86_64) + KPATH=arch/x86/boot/bzImage + ;; +(arm) + KPATH=arch/arm/boot/zImage + ;; +(*) + KPATH=vmlinuz + ;; +esac + +make $MAKEFLAGS ARCH="$ARCH" KCONFIG_ALLCONFIG=my.config DISABLE_PAX_PLUGINS=y allnoconfig + +if [ "$PKGNAME" = "linux-headers" ] +then + make $MAKEFLAGS ARCH="$ARCH" prefix="$PREFIX" INSTALL_HDR_PATH="$PREFIX" headers_install + exit 0 +fi + +make $MAKEFLAGS ARCH="$ARCH" CROSS_COMPILE="$($CC -dumpmachine)-" CC="$CC" CFLAGS="$CFLAGS" DISABLE_PAX_PLUGINS=y KBUILD_BUILD_USER=root KBUILD_BUILD_HOST=anon + +grep -q -E '=m$' my.config && make INSTALL_MOD_PATH="$PREFIX" DISABLE_PAX_PLUGINS=y modules_install || true +mkdir -p "$PREFIX/boot" && cp -f "$KPATH" "$PREFIX/boot/" diff --git a/system/linux/crusoe-nopl-emu.patch b/linux/crusoe-nopl-emu.patch diff --git a/system/linux/kconfig.sabotage b/linux/kconfig.sabotage diff --git a/system/linux/lastversion.sh b/linux/lastversion.sh diff --git a/system/linux/patch.sh b/linux/patch.sh diff --git a/system/linux/source.sh b/linux/source.sh diff --git a/system/linux/version b/linux/version diff --git a/mbsync/build b/mbsync/build @@ -1,5 +1,5 @@ ./configure \ --prefix="$PREFIX" \ - --with-ssl="$ROOT" + --with-ssl="$SYSROOT" make install diff --git a/mpop/build b/mpop/build @@ -1,5 +1,5 @@ -export libssl_CFLAGS=-I$ROOT/include -export libssl_LIBS=-L$ROOT/lib +export libssl_CFLAGS=-I$SYSROOT/include +export libssl_LIBS=-L$SYSROOT/lib ./configure \ --prefix="$PREFIX" \ @@ -7,7 +7,7 @@ export libssl_LIBS=-L$ROOT/lib make \ CFLAGS="$libssl_CFLAGS" \ - LDFLAGS="-L$ROOT/lib -lssl -lcrypto" \ - RPATH="$ROOT/opt/libopenssl/lib" + LDFLAGS="-L$SYSROOT/lib -lssl -lcrypto" \ + RPATH="$SYSROOT/opt/libopenssl/lib" make PREFIX="$PREFIX" install diff --git a/ngircd/build b/ngircd/build @@ -1,9 +1,9 @@ -export CFLAGS="-static -I$ROOT/lib" -export LDFLAGS="-L$ROOT/lib" - ./configure \ - --prefix="$PREFIX" \ - --with-openssl \ - --sysconfdir="$ROOT/pkg/ngircd/ngircd.conf" + CFLAGS="-I$SYSROOT/lib" \ + LDFLAGS="-L$SYSROOT/lib" \ + --prefix="$PREFIX" \ + --sbindir="$PREFIX/bin" \ + --with-openssl \ + --sysconfdir="$HOME/etc/ngircd/ngircd.conf" -make && make install +make install diff --git a/ngircd/crash b/ngircd/crash @@ -1 +0,0 @@ -pkg-service start ngircd diff --git a/ngircd/ngircd.conf b/ngircd/ngircd.conf @@ -1,123 +0,0 @@ -[Global] - Name = irc.josuah.net - - ;AdminInfo1 = Description - ;AdminInfo2 = Location - ;AdminEMail = mail@josuah.net - - ;HelpFile = ~/.config/ngircd/Commands.txt - - Info = Personnal IRC server for learning - - ;Listen = 0.0.0.0 - - # setup on ~/etc/ngircd.d/motd - ;MotdFile = /dev/null - ;MotdPhrase = "Welcome to cyberia.systems" - - Network = cyberia.systems - - ;Password = none - - ;PidFile = /var/run/ngircd/ngircd.pid - - Ports = 6667 - - ;ServerGID = 65534 - ;ServerUID = 65534 - -[Limits] - ;ConnectRetry = 60 - ;IdleTimeout = 0 - - ;MaxConnections = 0 - ;MaxConnectionsIP = 5 - ;MaxJoins = 10 - MaxNickLength = 14 - ;MaxListSize = 100 - - ;PingTimeout = 120 - ;PongTimeout = 20 - -[Options] - AllowedChannelTypes = # - AllowRemoteOper = no - - ;ChrootDir = /var/empty - - ;CloakHost = cloaked.host - ;CloakHostModeX = cloaked.user - ;CloakHostSalt = abcdefghijklmnopqrstuvwxyz - ;CloakUserToNick = yes - - ;ConnectIPv4 = yes - ;ConnectIPv6 = yes - - DefaultUserModes = i - - ;DNS = yes - - ;Ident = yes - - ;IncludeDir = ~/etc/ngircd.d - - MorePrivacy = yes - - ;NoticeBeforeRegistration = no - - ;OperCanUseMode = no - ;OperChanPAutoOp = yes - ;OperServerMode = no - - ;PAM = yes - ;PAMIsOptional = no - ;PAMServiceName = ngircd - - ;RequireAuthPing = no - - ScrubCTCP = yes - - ;SyslogFacility = local1 - - ;WebircPassword = xyz - -;[SSL] - ;CertFile = /home/pi/programs/ngircd/etc/ssl/server-cert.pem - - ;CipherList = HIGH:!aNULL:@STRENGTH:!SSLv3 - - ;DHFile = /home/pi/programs/ngircd/etc/ssl/dhparams.pem - - ;KeyFile = /home/pi/programs/ngircd/etc/ssl/server-key.pem - ;KeyFilePassword = secret - - ;Ports = 6697, 9999 - -[Server] - ;Name = irc2.example.net - ;Host = connect-to-host.example.net - ;Bind = 10.0.0.1 - ;Port = 6667 - - ;MyPassword = MySecret - ;PeerPassword = PeerSecret - - ;Group = 123 - - ;Passive = no - - ;SSLConnect = yes - - ;ServiceMask = *Serv,Global - -[Channel] - ;Name = #TheName - - ;Topic = a great topic - - ;Modes = tnk - - ;Key = Secret - ;KeyFile = /home/pi/programs/ngircd/etc/#chan.key - - ;MaxUsers = 23 diff --git a/ngircd/ngircd.motd b/ngircd/ngircd.motd @@ -1,11 +0,0 @@ - __________________ _ - / _______________/ / / ircs://cyberia.systems:6697 - / / __ __ / /_ ____ ____ /\ ____ - / / / / / / / __ \ / __ \ /\/___/ /\ ,-'_ / - \ \______\ \ / /__\ \/ /_\ __/_ / /____ / / / /_/ /___ - \_________\ \/ /____\__/___\__\ /_/____ /_/__\_____\ _ \ - \ / ___ ___ _____ ___ ___ \ \ - ________/ / /__ /__/ /__ / /__ /\/\ /__ / / - \________/ ___/ ___/ ___/ / /__ / / / ___/ / / - / / - \/ diff --git a/opentracker/build b/opentracker/build @@ -1,5 +1,5 @@ make \ - LIBOWFAT_HEADERS="$ROOT/include" \ - LIBOWFAT_LIBRARY="$ROOT/lib" + LIBOWFAT_HEADERS="$SYSROOT/include" \ + LIBOWFAT_LIBRARY="$SYSROOT/lib" make PREFIX="$PREFIX" install diff --git a/rsync/build b/rsync/build @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +export LDFLAGS="$LDFLAGS -Wl,-rpath-link=$SYSROOT$PREFIX/lib" +export CC="$CC -L$SYSROOT/lib -isystem $SYSROOT/include" + +[ -n "$CROSS_COMPILE" ] && CONFFLAGS="$CONFFLAGS --host=$CROSS_COMPILE" + +CFLAGS="-D_GNU_SOURCE $CFLAGS" ./configure $CONFFLAGS --prefix="$PREFIX" + +make $MAKEFLAGS +make $MAKEFLAGS DESTDIR="$DESTDIR" install diff --git a/rsync/build.sh b/rsync/build.sh @@ -1,13 +0,0 @@ -#!/bin/sh -set -e - -export LDFLAGS="$LDFLAGS -Wl,-rpath-link=$SYSROOT$PREFIX/lib" -export CC="$CC -L$SYSROOT/lib -isystem $SYSROOT/include" - -[ -n "$CROSS_COMPILE" ] && CONFFLAGS="$CONFFLAGS --host=$CROSS_COMPILE" - -CFLAGS="-D_GNU_SOURCE $CFLAGS" \ -./configure $CONFFLAGS --prefix="$PREFIX" - -make $MAKEFLAGS -make $MAKEFLAGS DESTDIR="$DESTDIR" install diff --git a/rsync/lastversion.sh b/rsync/lastversion.sh @@ -1,2 +0,0 @@ -#!/bin/sh -curl -s "https://rsync.samba.org/ftp/rsync/"|grep -oE 'rsync-[0-9\.]*[0-9]'|cut '-d-' -f2|sort -Vu|tail -n 1 diff --git a/rsync/patch.sh b/rsync/patch.sh @@ -1,2 +0,0 @@ -#!/bin/sh -patch -p1 -l < "$PKGDIR"/rsync-fix-proto.h-tstamp-target.patch diff --git a/rsync/source.sh b/rsync/source.sh @@ -1,2 +0,0 @@ -#!/bin/sh -echo "https://rsync.samba.org/ftp/rsync/rsync-$VERSION.tar.gz" diff --git a/rsync/tar b/rsync/tar @@ -0,0 +1 @@ +https://rsync.samba.org/ftp/rsync/rsync-3.1.2.tar.gz diff --git a/rsync/version b/rsync/version @@ -1 +0,0 @@ -3.1.2 diff --git a/runit/build b/runit/build @@ -1,6 +1,8 @@ -[ -d runit ] || mv runit-* runit - -cd runit +if ! [ -d src ] +then + mv runit*/* . + rmdir runit* +fi package/compile diff --git a/scron/crash b/scron/crash @@ -1 +0,0 @@ -pkg-service start scron diff --git a/stunnel/build b/stunnel/build @@ -1,3 +1,3 @@ -./configure --prefix="$PREIFX" --with-ssl="$ROOT/libopenssl" && +./configure --prefix="$PREIFX" --with-ssl="$SYSROOT/libopenssl" && make && make prefix="$PREFIX" install cert diff --git a/system/linux/build.sh b/system/linux/build.sh @@ -1,27 +0,0 @@ -#!/bin/sh -set -e - -ARCH="$($CC -dumpmachine|cut '-d-' -f1|sed 's/i[3-6]86/i386/')" -case $ARCH in - i386|x86_64) - KPATH=arch/x86/boot/bzImage - ;; - arm) - KPATH=arch/arm/boot/zImage - ;; - *) - KPATH=vmlinuz - ;; -esac - -make $MAKEFLAGS ARCH="$ARCH" KCONFIG_ALLCONFIG=my.config DISABLE_PAX_PLUGINS=y allnoconfig - -if [ "$PKGNAME" = "linux-headers" ]; then - make $MAKEFLAGS ARCH="$ARCH" prefix="$PREFIX" INSTALL_HDR_PATH="$DESTDIR" headers_install - exit 0 -fi - -make $MAKEFLAGS ARCH="$ARCH" CROSS_COMPILE="$($CC -dumpmachine)-" CC="$CC" CFLAGS="$CFLAGS" DISABLE_PAX_PLUGINS=y KBUILD_BUILD_USER=root KBUILD_BUILD_HOST=anon - -grep -q -E '=m$' my.config && make INSTALL_MOD_PATH="$DESTDIR" DISABLE_PAX_PLUGINS=y modules_install || true -mkdir -p "$DESTDIR/boot" && cp -f "$KPATH" "$DESTDIR/boot/"