building up to pam (with krb5 and libtirpc)

6 files changed, 26 insertions, 28 deletions

diff --git a/TODOS b/TODOS
index 6edae52..c044c11 100644
--- a/TODOS
+++ b/TODOS
@@ -86,4 +86,3 @@ stage2 issues:
 stage 3 issues:
 - some packages don't install (also in stage 1): iana-etc, filesystem
 - can we build layers in parallel?
-
diff --git a/build_stage1_package.sh b/build_stage1_package.sh
index af4016c..1e7f877 100755
--- a/build_stage1_package.sh
+++ b/build_stage1_package.sh
@@ -122,9 +122,10 @@ if test "$(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT"
 	
 		# install into chroot via pacman
 		
-		sudo pacman --noconfirm --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" -Syy "$PACKAGE"
 		if test "x$ADDITIONAL_INSTALL_PACKAGE" != "x"; then
-			sudo pacman --noconfirm --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" -Syy "$ADDITIONAL_INSTALL_PACKAGE"
+			sudo pacman --noconfirm --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" -Syy "$PACKAGE" "$ADDITIONAL_INSTALL_PACKAGE"
+		else
+			sudo pacman --noconfirm --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" -Syy "$PACKAGE"
 		fi
 
 		# optionally install into cross-compiler sysroot with bsdtar
diff --git a/build_stage2_package.sh b/build_stage2_package.sh
index 34c3826..b79210f 100755
--- a/build_stage2_package.sh
+++ b/build_stage2_package.sh
@@ -129,12 +129,13 @@ if test "$(find "$STAGE2_PACKAGES" -regex ".*/$PACKAGE-.*pkg\\.tar\\.xz" | wc -l
 
 		ssh -i $CROSS_HOME/.ssh/id_rsa root@$STAGE1_MACHINE_IP bash -c "'		
 			# TODO: broken [temp] repo
-			#pacman --noconfirm -Syy $PACKAGE
-			pacman --noconfirm -U /packages/$TARGET_CPU/$PACKAGE-*.pkg.tar.xz
-			if test $ADDITIONAL_INSTALL_PACKAGE != ""; then
-				#pacman --noconfirm -Syy $ADDITIONAL_INSTALL_PACKAGE
-				pacman --noconfirm -U /packages/$TARGET_CPU/$ADDITIONAL_INSTALL_PACKAGE-*.pkg.tar.xz
-			fi		
+			if test \"$ADDITIONAL_INSTALL_PACKAGE\" != \"\"; then
+				#pacman --noconfirm -Syy $PACKAGE $ADDITIONAL_INSTALL_PACKAGE
+				pacman --noconfirm -U /packages/$TARGET_CPU/$PACKAGE-*.pkg.tar.xz /packages/$TARGET_CPU/$ADDITIONAL_INSTALL_PACKAGE-*.pkg.tar.xz
+			else
+				#pacman --noconfirm -Syy $PACKAGE
+				pacman --noconfirm -U /packages/$TARGET_CPU/$PACKAGE-*.pkg.tar.xz
+			fi
 		'"
 		
 		# copy packages from target machine and replace our local version with it
diff --git a/build_stage3.sh b/build_stage3.sh
index 7107510..8bbe542 100755
--- a/build_stage3.sh
+++ b/build_stage3.sh
@@ -14,7 +14,7 @@ ncurses readline bash joe
 attr acl m4 gmp gdbm db perl openssl
 libunistring gettext perl-locale-gettext help2man
 autoconf automake perl-error pcre2 git libtool
-zlib pambase cracklib flex pam libcap coreutils
+zlib pambase cracklib flex libcap coreutils
 e2fsprogs expat bzip2 lz4 xz pcre less gzip
 tar libarchive
 icu
@@ -46,13 +46,13 @@ npth
 popt logrotate
 hwids pciutils
 keyutils
-tcl sqlite libsasl chrpath unixodbc
+tcl sqlite libsasl chrpath unixodbc openldap
+krb5 libtirpc pam
 reiserfsprogs
 sysfsutils iputils
 vi
 which
 xfsprogs
-openldap
 "
 
 #~ <net-tools> <libmnl> <libnfnetlink> iptables iproute2
@@ -70,9 +70,6 @@ openldap
 #~ gdb: python guile2.0
 # wait for posix threads, gcc toolchain rebuild
 
-# HERE TODO: libraries must be installed before the server overlays, why are they not?
-# openldap: 
-
 # building toolchain (gcc): again, lobtool problems
 #/usr/lib/gcc/i486-pc-linux-gnu/7.3.0/ld: cannot find -lquadmath
 #collect2: error: ld returned 1 exit status
@@ -90,11 +87,6 @@ openldap
 #~ xmlto: libxslt docbook-xsl
 #~ asciidoc: python
 #~ git: python2 emacs libgnome-keyring xmlto asciidoc
-#~
-#~ libldap: libsasl
-#~ krb5: e2fsprogs libldap keyutils
-#~ keyutils: glibc sh  
-#~ libtirpc: krb5
 
 #~ util-linux:
 #~ pkg-config: glib2
@@ -128,7 +120,6 @@ openldap
 #~ ldns: openssl dnssec-anchors 
 #~ dnssec-anchors: unbound
 #~ libsecret: glib2 libgcrypt 
-#~ libtirpc: krb5 
 #~ libusb: glibc libsystemd 
 #~ make: glibc guile 
 #~ mkinitcpio: awk mkinitcpio-busybox kmod util-linux libarchive coreutils bash findutils grep filesystem gzip systemd 
diff --git a/build_stage3_package.sh b/build_stage3_package.sh
index fe80592..78fc5a6 100755
--- a/build_stage3_package.sh
+++ b/build_stage3_package.sh
@@ -133,12 +133,13 @@ if test "$(find "$STAGE3_PACKAGES" -regex ".*/$PACKAGE-.*pkg\\.tar\\.xz" | wc -l
 
 		ssh -i $CROSS_HOME/.ssh/id_rsa root@$STAGE1_MACHINE_IP bash -c "'		
 			# TODO: broken [temp] repo
-			#pacman --noconfirm -Syy $PACKAGE
-			pacman --noconfirm -U /packages/$TARGET_CPU/$PACKAGE-*.pkg.tar.xz
-			if test $ADDITIONAL_INSTALL_PACKAGE != ""; then
-				#pacman --noconfirm -Syy $ADDITIONAL_INSTALL_PACKAGE
-				pacman --noconfirm -U /packages/$TARGET_CPU/$ADDITIONAL_INSTALL_PACKAGE-*.pkg.tar.xz
-			fi		
+			if test \"$ADDITIONAL_INSTALL_PACKAGE\" != \"\"; then
+				#pacman --noconfirm -Syy $PACKAGE $ADDITIONAL_INSTALL_PACKAGE
+				pacman --noconfirm -U /packages/$TARGET_CPU/$PACKAGE-*.pkg.tar.xz /packages/$TARGET_CPU/$ADDITIONAL_INSTALL_PACKAGE-*.pkg.tar.xz
+			else
+				#pacman --noconfirm -Syy $PACKAGE
+				pacman --noconfirm -U /packages/$TARGET_CPU/$PACKAGE-*.pkg.tar.xz
+			fi
 		'"
 		
 		# copy packages from target machine and replace our local version with it
diff --git a/i486-stage3/openldap/DESCR b/i486-stage3/openldap/DESCR
index bbf06e2..eaab0e8 100644
--- a/i486-stage3/openldap/DESCR
+++ b/i486-stage3/openldap/DESCR
@@ -1,6 +1,11 @@
 # FS#57749: relink against missing libraries in split package
 sed -i 's/for dir in clients servers/for dir in libraries clients servers/' PKGBUILD
-sed -i '/usr\/share\/man\/man5\/slapo-lastbind.5/ a rm -rf ${pkgdir}/usr/{lib,include,man3}' PKGBUILD
+# ldap.conf comes in package 'libldap', also include, libs and devel man
+# => remove them in 'openldap' package
+sed -i '/usr\/share\/man\/man5\/slapo-lastbind.5/ a \
+	rm -rf ${pkgdir}/etc/openldap/ldap.conf \
+	rm -rf ${pkgdir}/usr/{lib,include,man3} \
+' PKGBUILD
 
 # we actually need only libldap, but installing openldap doesn't harm us
 ADDITIONAL_INSTALL_PACKAGE=libldap