building more systemd stuff in stage4

11 files changed, 62 insertions, 54 deletions

diff --git a/build_stage4.sh b/build_stage4.sh
index 71039a6..6c4836c 100755
--- a/build_stage4.sh
+++ b/build_stage4.sh
@@ -14,20 +14,19 @@ ncurses readline bash joe nano vi
 libxml2 emacs-nox
 attr acl m4 gmp gdbm db perl openssl
 libunistring gettext perl-locale-gettext help2man
-autoconf tcl expect dejagnu cscope automake
+autoconf autoconf-archive tcl expect dejagnu cscope automake
 perl-test-pod perl-devel-symdump perl-pod-coverage
 perl-test-pod-coverage perl-error pcre2
 docbook-xml libxslt docbook-xsl xmlto asciidoc git
 libtool
 zlib pambase cracklib libtirpc flex gpm w3m
 tcl sqlite postgresql
-doxygen graphviz
 jsoncpp 
 libuv rhash shared-mime-info
 cmake
 jemalloc lzo mariadb libsasl
 chrpath unixodbc openldap
-krb5 libtirpc
+keyutils krb5 libtirpc
 pam
 libcap coreutils util-linux pkg-config e2fsprogs
 expat bzip2 lz4 xz pcre less gzip
@@ -41,7 +40,7 @@ perl-http-date perl-encode-locale perl-lwp-mediatypes perl-test-needs
 perl-uri perl-io-html perl-try-tiny perl-http-message perl-lwp-mediatypes
 perl-http-daemon perl-io-socket-ssl
 wget
-libusb-compat pcsclite gnupg gpgme
+libusb-compat pcsclite npth gnupg gpgme
 pacman-mirrorlist archlinux-keyring archlinux32-keyring
 sharutils perl-text-charwidth perl-text-wrapi18n 
 perl-term-readkey perl-sgmls
@@ -52,103 +51,76 @@ po4a fakeroot fakechroot
 pacman
 elfutils sed texinfo grep findutils file diffutils ed patch
 check kbd procps-ng bison shadow
-inetutils bc kmod linux uinit nasm ucl upx syslinux
+mkinitcpio-busybox mkinitcpio
+inetutils bc hwids pciutils kmod linux linux-firmware
+uinit nasm ucl upx syslinux
 net-tools libmnl libnfnetlink
-libedit openssh
+libedit ldns openssh
 which
 libatomic_ops gc guile make guile2.0 gdb
 libunwind strace
+groff libseccomp man-db man-pages
+popt logrotate psmisc linux-atm iproute2 iputils sudo
+libcap-ng libidn2 libnghttp2 libpsl libpipeline libmicrohttpd libssh2
+argon2 json-c cryptsetup
+s-nail quota-tools perl-xml-parser intltool
+gperf
 "
 
 #~ mpfr gawk libmpc binutils gcc glibc
-
-# =>
-#~ libsasl
-#~  -> postgresql-libs
-  -> libmariadbclient
-
-
-#~ cryptsetup: argon2 popt json-c libgcrypt
-#~ groff
+#~ 
 #~ jfsutils
-#~ libcap-ng
-#~ libnftnl
-#~ libidn2 libnghttp2 libpsl
-#~ libpipeline libseccomp man-db man-pages
-#~ libmicrohttpd
-#~ libssh2
 #~ mdadm
-#~ nano
-#~ npth
-#~ popt logrotate
-#~ hwids pciutils
-#~ keyutils
 #~ reiserfsprogs
-#~ sysfsutils iputils
-#~ s-nail
-#~ vi
 #~ xfsprogs
-#~ psmisc
-#~ sudo
-#~ autoconf-archive
-#~ linux-atm iproute2
-#~ python quota-tools perl-xml-parser intltool
+#~ sysfsutils 
+
+#~ python 
 #~ re2c python2 ninja
 #~ python-pip-bootstrap python-pip
 #~ python-pyparsing python-packaging python-appdirs python-six python-setuptools
 #~ meson
-#~ gperf systemd dbus libusb usbutils libpcap iptables iproute2 util-linux
+
+#~ <gperf> systemd dbus libusb usbutils libpcap libnftnl iptables iproute2 util-linux
 #~ procps-ng pcmciautils openresolv netctl dhcpcd
-#~ mkinitcpio-busybox mkinitcpio
+
 #~ glib2 pkg-config
-#~ ldns openssh
+
 #~ zip nspr gyp nss
+
 #~ libaio boost
 #~ thin-provisioning-tools lvm2
-#~ nasm syslinux
-#~ linux linux-firmware
 #~ "
 
 
 #~ stage2:
 #~ PACKAGES="
 #~           
-#~ make mpfr gawk libmpc binutils gcc glibc
+#~ mpfr gawk libmpc binutils gcc glibc
 #~ "
 
 # Archlinux base, base-devel groups
-#~ cryptsetup
 #~ device-mapper
 #~ dhcpcd
 #~ gawk
 #~ gcc-libs
 #~ glibc
-#~ iproute2
-#~ iputils
+#~ 
 #~ jfsutils
 #~ licenses
-#~ logrotate
 #~ lvm2
-#~ man-db
-#~ man-pages
 #~ mdadm
 #~ netctl
-#~ pciutils
-#~ pcmciautils
-#~ psmisc
-#~ reiserfsprogs
-#~ s-nail
 #~ sysfsutils
 #~ systemd-sysvcompat
 #~ usbutils
+#~ pcmciautils
+#~ reiserfsprogs
 #~ xfsprogs
 
 #~ binutils
 #~ gawk
 #~ gcc
-#~ groff
-#~ make
-#~ sudo
 #~ systemd
 
 for p in $PACKAGES; do
diff --git a/i486-stage4/groff/DESCR b/i486-stage4/groff/DESCR
new file mode 100644
index 0000000..098a3cb
--- /dev/null
+++ b/i486-stage4/groff/DESCR
@@ -0,0 +1,4 @@
+# no optional dependencies for gross, especially no dependency on X
+sed -i "/makedepends=/s/'netpbm'//" PKGBUILD
+sed -i "/makedepends=/s/'psutils'//" PKGBUILD
+sed -i "/makedepends=/s/'libxaw'//" PKGBUILD
diff --git a/i486-stage4/iputils/DESCR b/i486-stage4/iputils/DESCR
new file mode 100644
index 0000000..b389be8
--- /dev/null
+++ b/i486-stage4/iputils/DESCR
@@ -0,0 +1,4 @@
+# no documentation
+sed -i "/makedepends=/s/docbook-utils//" PKGBUILD
+sed -i 's/\(make -C doc man\)/#\1/' PKGBUILD
+sed -i '/install.*doc/,/pkgdir/s/\(.*\)/#\1/' PKGBUILD
diff --git a/i486-stage4/json-c/DESCR b/i486-stage4/json-c/DESCR
new file mode 100644
index 0000000..7297b06
--- /dev/null
+++ b/i486-stage4/json-c/DESCR
@@ -0,0 +1,7 @@
+# TODO: all tests fail
+# TOTAL: 21
+# PASS:  0
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  21
+SKIP_CHECK=1
diff --git a/i486-stage4/ldns/DESCR b/i486-stage4/ldns/DESCR
new file mode 100644
index 0000000..eb1e74a
--- /dev/null
+++ b/i486-stage4/ldns/DESCR
@@ -0,0 +1,3 @@
+# break the cycle via ldns, unbound draws in a
+# crazy amount of dependencies, via protobuf even clang/llvm!
+sed -i "/depends=/s/'dnssec-anchors'//" PKGBUILD
diff --git a/i486-stage4/libidn2/DESCR b/i486-stage4/libidn2/DESCR
new file mode 100644
index 0000000..e4157fa
--- /dev/null
+++ b/i486-stage4/libidn2/DESCR
@@ -0,0 +1,3 @@
+# remove dependency on gtk-doc and ruby-ronn 
+sed -i "/makedepends=/s/'gtk-doc'//" PKGBUILD
+sed -i "/makedepends=/s/'ruby-ronn'//" PKGBUILD
diff --git a/i486-stage4/libpsl/DESCR b/i486-stage4/libpsl/DESCR
new file mode 100644
index 0000000..bc19511
--- /dev/null
+++ b/i486-stage4/libpsl/DESCR
@@ -0,0 +1,3 @@
+# no documentation
+sed -i "/makedepends=/s/'gtk-doc'//" PKGBUILD
+sed -i "s@--enable-gtk-doc@--disable-gtk-doc@" PKGBUILD
diff --git a/i486-stage4/libunwind/DESCR b/i486-stage4/libunwind/DESCR
new file mode 100644
index 0000000..c535fae
--- /dev/null
+++ b/i486-stage4/libunwind/DESCR
@@ -0,0 +1,2 @@
+# no TeX for documentation
+sed -i "/makedepends=/s/'texlive-core'//" PKGBUILD
diff --git a/i486-stage4/man-db/DESCR b/i486-stage4/man-db/DESCR
new file mode 100644
index 0000000..d793ea4
--- /dev/null
+++ b/i486-stage4/man-db/DESCR
@@ -0,0 +1,2 @@
+# TODO: FAIL: man-6
+SKIP_CHECK=1
diff --git a/i486-stage4/mariadb/DESCR b/i486-stage4/mariadb/DESCR
index 2c4d532..6af465a 100644
--- a/i486-stage4/mariadb/DESCR
+++ b/i486-stage4/mariadb/DESCR
@@ -9,3 +9,6 @@ sed -i 's/cmake /cmake -DCONNECT_WITH_JDBC=0/' PKGBUILD
 sed -i 's@source=(@source=(mariadb-10.1.32-atomic.patch @' PKGBUILD
 sed -i "s@sha256sums=(@sha256sums=('194e43ca5468d4f4634f45eed6aaf08865c2d351fcc500696d4dc578fe94902e' @" PKGBUILD
 sed -i '/patch -Np1.*mroonga/ a \  patch -Np1 -i "${srcdir}/mariadb-10.1.32-atomic.patch"' PKGBUILD
+
+ADDITIONAL_INSTALL_PACKAGE=libmariadbclient
+
diff --git a/i486-stage4/s-nail/DESCR b/i486-stage4/s-nail/DESCR
new file mode 100644
index 0000000..b028487
--- /dev/null
+++ b/i486-stage4/s-nail/DESCR
@@ -0,0 +1,5 @@
+# TODO: failing tests
+# behave:wysh_unicode: error: checksum mismatch (got 1473887148 321)
+# behave:iconv_mbyte_base64-3: error: checksum mismatch (got 2220752689 506)
+# behave:iconv_mbyte_base64-4: error: checksum mismatch (got 2311398702 1673)
+SKIP_CHECK=1