now at cracklib

11 files changed, 118 insertions, 1 deletions

diff --git a/src/stage1/build_from_deptree.sh b/src/stage1/build_from_deptree.sh
index f7e727c..fe748ab 100644
--- a/src/stage1/build_from_deptree.sh
+++ b/src/stage1/build_from_deptree.sh
@@ -41,7 +41,7 @@ while [ -s "$_deptree" ]; do
 
     if [ "x$_pkgarch" == "xany" ]; then
       # simply reuse arch=(any) packages
-      _pkgver=$(pacman -Qi $_pkgname | grep '^Version' | awk '{print $3}')
+      _pkgver=$(pacman -Si $_pkgname | grep '^Version' | awk '{print $3}')
       pacman -Sw --noconfirm --cachedir . $_pkgname
     else
       # acquire the pkgbuild and auxiliary files
@@ -67,6 +67,7 @@ while [ -s "$_deptree" ]; do
 
       # substitute common variables
       sed -i "s#@TARGET@#$_target#g" PKGBUILD
+      sed -i "s#@SYSROOT@#$_chrootdir#g" PKGBUILD
       sed -i "s#@LINUX_ARCH@#$_linux_arch#g" PKGBUILD
 
       # enable the target arch explicitly
diff --git a/src/stage1/create_package_tree.sh b/src/stage1/create_package_tree.sh
index 7676c70..98aef9c 100644
--- a/src/stage1/create_package_tree.sh
+++ b/src/stage1/create_package_tree.sh
@@ -55,6 +55,11 @@ if [ ! -f "$_deptree" ]; then
   # add some additional build-order dependencies by hand
   _tree[libutil-linux]="${_tree[libutil-linux]}pam libcap-ng ncurses "
   _tree[gcc-libs]="${_tree[gcc-libs]}libmpfr "
+  _tree[libpsl]="${_tree[libpsl]}publicsuffix-list "
+  _tree[publicsuffix-list]=""
+
+  # TODO: these packages currently don't build
+  _tree[libatomic_ops]="${_tree[libatomic_ops]}cantbuild "
 
   # log package dependency tree
   truncate -s0 "$_deptree".FULL
diff --git a/src/stage1/patches/acl.patch b/src/stage1/patches/acl.patch
new file mode 100644
index 0000000..b4ea426
--- /dev/null
+++ b/src/stage1/patches/acl.patch
@@ -0,0 +1,13 @@
+--- a/PKGBUILD	2018-02-16 13:54:08.475632636 +0100
++++ b/PKGBUILD	2018-02-16 13:54:58.669516546 +0100
+@@ -21,7 +21,9 @@ build() {
+   cd $pkgname-$pkgver
+ 
+   export INSTALL_USER=root INSTALL_GROUP=root
+-  ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib
++  curl "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
++    > config.sub
++  ./configure --host=@TARGET@ --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib
+   make
+ }
+ 
diff --git a/src/stage1/patches/attr.patch b/src/stage1/patches/attr.patch
new file mode 100644
index 0000000..14d7e96
--- /dev/null
+++ b/src/stage1/patches/attr.patch
@@ -0,0 +1,13 @@
+--- a/PKGBUILD	2018-02-16 13:50:22.989842726 +0100
++++ b/PKGBUILD	2018-02-16 13:52:17.694421922 +0100
+@@ -22,7 +22,9 @@ build() {
+   cd $pkgname-$pkgver
+ 
+   export INSTALL_USER=root INSTALL_GROUP=root
+-  ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib
++  curl "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
++    > config.sub
++  ./configure --host=@TARGET@ --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib
+   make
+ }
+ 
diff --git a/src/stage1/patches/file.patch b/src/stage1/patches/file.patch
new file mode 100644
index 0000000..460b576
--- /dev/null
+++ b/src/stage1/patches/file.patch
@@ -0,0 +1,11 @@
+--- a/PKGBUILD	2018-02-16 14:06:38.830608498 +0100
++++ b/PKGBUILD	2018-02-16 14:13:14.468358210 +0100
+@@ -32,7 +32,7 @@ prepare() {
+ 
+ build() {
+   cd $pkgname-$pkgver
+-  ./configure --prefix=/usr --datadir=/usr/share/file --enable-fsect-man5
++  ./configure --host=@TARGET@ --build=$(uname -m)-unknown-linux-gnu --prefix=/usr --datadir=/usr/share/file --enable-fsect-man5
+   make
+ }
+ 
diff --git a/src/stage1/patches/libidn2.patch b/src/stage1/patches/libidn2.patch
new file mode 100644
index 0000000..5e6d79a
--- /dev/null
+++ b/src/stage1/patches/libidn2.patch
@@ -0,0 +1,11 @@
+--- a/PKGBUILD	2018-02-16 14:27:03.120898876 +0100
++++ b/PKGBUILD	2018-02-16 14:29:39.839309428 +0100
+@@ -24,7 +24,7 @@ prepare() {
+ 
+ build() {
+   cd $pkgname-$pkgver
+-  ./configure --prefix=/usr
++  ./configure --host=@TARGET@ --prefix=/usr
+   make
+ }
+ 
diff --git a/src/stage1/patches/libnghttp2.patch b/src/stage1/patches/libnghttp2.patch
new file mode 100644
index 0000000..6304a26
--- /dev/null
+++ b/src/stage1/patches/libnghttp2.patch
@@ -0,0 +1,10 @@
+--- a/PKGBUILD	2018-02-16 13:44:06.262500950 +0100
++++ b/PKGBUILD	2018-02-16 13:45:48.896910168 +0100
+@@ -19,6 +19,7 @@ build() {
+ 
+   autoreconf -i
+   ./configure \
++    --host=@TARGET@ \
+     --prefix=/usr \
+     --disable-examples \
+     --disable-python-bindings \
diff --git a/src/stage1/patches/libnl.patch b/src/stage1/patches/libnl.patch
new file mode 100644
index 0000000..f398fa5
--- /dev/null
+++ b/src/stage1/patches/libnl.patch
@@ -0,0 +1,10 @@
+--- a/PKGBUILD	2018-02-16 13:37:23.361325553 +0100
++++ b/PKGBUILD	2018-02-16 13:39:23.382675703 +0100
+@@ -19,6 +19,7 @@ validpgpkeys=('49EA7C670E0850E7419514F62
+ build() {
+   cd $pkgname-$pkgver
+   ./configure \
++    --host=@TARGET@ \
+     --prefix=/usr \
+     --sysconfdir=/etc \
+     --sbindir=/usr/bin \
diff --git a/src/stage1/patches/libpsl.patch b/src/stage1/patches/libpsl.patch
new file mode 100644
index 0000000..0690985
--- /dev/null
+++ b/src/stage1/patches/libpsl.patch
@@ -0,0 +1,21 @@
+--- a/PKGBUILD	2018-02-16 14:38:32.235244930 +0100
++++ b/PKGBUILD	2018-02-16 14:41:16.650413298 +0100
+@@ -22,14 +22,15 @@ prepare() {
+ build() {
+   cd ${pkgname}-${pkgver}
+   ./configure \
++    --host=@TARGET@ \
+     --prefix=/usr \
+     --disable-static \
+     --disable-dependency-tracking \
+     --enable-man \
+-    --enable-gtk-doc \
++    --disable-gtk-doc \
+     --enable-{builtin,runtime}=libidn2 \
+-    --with-psl-file=/usr/share/publicsuffix/effective_tld_names.dat \
+-    --with-psl-testfile=/usr/share/publicsuffix/test_psl.txt
++    --with-psl-file=@SYSROOT@/usr/share/publicsuffix/effective_tld_names.dat \
++    --with-psl-testfile=@SYSROOT@/usr/share/publicsuffix/test_psl.txt
+   LC_CTYPE=en_US.UTF-8 make
+ }
+ 
diff --git a/src/stage1/patches/patch.patch b/src/stage1/patches/patch.patch
new file mode 100644
index 0000000..62a897a
--- /dev/null
+++ b/src/stage1/patches/patch.patch
@@ -0,0 +1,11 @@
+--- a/PKGBUILD	2018-02-16 14:03:40.438622198 +0100
++++ b/PKGBUILD	2018-02-16 14:05:03.509546626 +0100
+@@ -34,7 +34,7 @@ prepare() {
+ 
+ build() {
+   cd $pkgname-$pkgver
+-  ./configure --prefix=/usr
++  ./configure --host=@TARGET@ --prefix=/usr
+   make
+ }
+ 
diff --git a/src/stage1/patches/tar.patch b/src/stage1/patches/tar.patch
new file mode 100644
index 0000000..ccaf09f
--- /dev/null
+++ b/src/stage1/patches/tar.patch
@@ -0,0 +1,11 @@
+--- a/PKGBUILD	2018-02-16 13:59:07.215590435 +0100
++++ b/PKGBUILD	2018-02-16 14:01:48.097373800 +0100
+@@ -33,7 +33,7 @@ prepare() {
+ 
+ build() {
+   cd $pkgname-$pkgver
+-  ./configure --prefix=/usr --libexecdir=/usr/lib/tar
++  ./configure --host=@TARGET@ --prefix=/usr --libexecdir=/usr/lib/tar
+   make
+ }
+