diff options
author | Andreas Baumann <mail@andreasbaumann.cc> | 2018-02-05 21:46:28 +0100 |
---|---|---|
committer | Andreas Baumann <mail@andreasbaumann.cc> | 2018-02-05 21:46:28 +0100 |
commit | 7c7a001ee6b8642121d28191bcc913c2ea452900 (patch) | |
tree | f6c94f1fa52ea89994a1c2d2e2ee3f382d0bc287 /i486-stage1 | |
parent | ae49983b15e102ff4850e2b387ebafc839cdc9e5 (diff) | |
download | bootstrap32-7c7a001ee6b8642121d28191bcc913c2ea452900.tar.xz |
building up to pacman pre-requisites, pacman itself doesn't work yet
changed checkout method parameter, we have asp, yaourt and packages32 now
Diffstat (limited to 'i486-stage1')
-rw-r--r-- | i486-stage1/archlinux-keyring/DESCR | 0 | ||||
-rw-r--r-- | i486-stage1/archlinux32-keyring/DESCR | 2 | ||||
-rw-r--r-- | i486-stage1/pacman-mirrorlist/DESCR | 5 | ||||
-rw-r--r-- | i486-stage1/pacman/DESCR | 25 | ||||
-rw-r--r-- | i486-stage1/template/DESCR | 12 | ||||
-rw-r--r-- | i486-stage1/uinit/DESCR | 2 |
6 files changed, 41 insertions, 5 deletions
diff --git a/i486-stage1/archlinux-keyring/DESCR b/i486-stage1/archlinux-keyring/DESCR new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/i486-stage1/archlinux-keyring/DESCR diff --git a/i486-stage1/archlinux32-keyring/DESCR b/i486-stage1/archlinux32-keyring/DESCR new file mode 100644 index 0000000..7fbf211 --- /dev/null +++ b/i486-stage1/archlinux32-keyring/DESCR @@ -0,0 +1,2 @@ +# this package exists only in Archlinux32, copy the whole bunch +FETCH_METHOD="packages32" diff --git a/i486-stage1/pacman-mirrorlist/DESCR b/i486-stage1/pacman-mirrorlist/DESCR new file mode 100644 index 0000000..233e5bc --- /dev/null +++ b/i486-stage1/pacman-mirrorlist/DESCR @@ -0,0 +1,5 @@ +# append our local i486 only mirror for now +cat >> mirrorlist <<EOF +## Switzerland +Server = https://archlinux32.andreasbaumann.cc/\$arch/\$repo +EOF diff --git a/i486-stage1/pacman/DESCR b/i486-stage1/pacman/DESCR new file mode 100644 index 0000000..0ad0305 --- /dev/null +++ b/i486-stage1/pacman/DESCR @@ -0,0 +1,25 @@ +# prepare configure for cross-compilation +sed -i "s@./configure@./configure --host=$TARGET_ARCH --build=$BUILD_ARCH@g" PKGBUILD + +# minimal dependencies, we don't sign anything yet, gpgme and gnupg have +# far too many dependencies which cannot be easily cross-compiled +sed -i "1!N;/depends=/s/'gpgme'//" PKGBUILD +sed -i 's@./configure@./configure --without-gpgme@' PKGBUILD + +# asciidoc is a makedepend, we can use the one on the host (this means +# also we can pacman only rebuild on i486 itself after the whole python +# zoo is installed) +sed -i "/makedepends=/s/'asciidoc'//" PKGBUILD + +#TODO FROM HERE + +# craft a temporary i486 pacman.conf (no gpg and hard-coded architecture) +cp pacman.conf.i686 pacman.conf.i486 +sed -i 's@^\(SigLevel\)@#\1@' pacman.conf.i486 +sed -i 's@^\(LocalFileSigLevel\)@#\1@' pacman.conf.i486 +# TODO: ADAPT sed -i 's@i686@i486@' pacman/PKGBUILD +sed -i 's@./configure@./configure --host=i486-unknown-linux-gnu --build=x86_64-pc-linux-gnu@g' pacman/PKGBUILD +# use 486 config and not 686 one +sed -i 's@pacman.conf.i686@pacman.conf.i486@' pacman/PKGBUILD +# some more architecture patching +sed -i 's@i686@i486@g' pacman/PKGBUILD diff --git a/i486-stage1/template/DESCR b/i486-stage1/template/DESCR index faa5d7f..1e3a94a 100644 --- a/i486-stage1/template/DESCR +++ b/i486-stage1/template/DESCR @@ -1,7 +1,11 @@ -# NEEDS_YAOURT = 0 | 1 -# asp is the default tool to fetch packages, if the -# package is only available in AUR, the set NEEDS_YAOURT=1 -NEEDS_YAOURT=0 +# FETCH_METHOD = "asp" | "yaourt" | "packages32" +# "asp" is the default tool to fetch the package description PKGBUILD and +# associated patch and other files. +# If the package exists only on AUR, then use "yaourt". +# If you want the package from Archlinux32, use "packages32". +# (this is only for where to get the base set of files from, the patches +# from packages32 are always applied) +FETCH_METHOD="asp" # NOPARALLEL_BUILD = 0 | 1 # the -j<N> parameter to makepkg will be set to -j if diff --git a/i486-stage1/uinit/DESCR b/i486-stage1/uinit/DESCR index 50ccc45..1d1a56e 100644 --- a/i486-stage1/uinit/DESCR +++ b/i486-stage1/uinit/DESCR @@ -1,5 +1,5 @@ # uinit as temporary systemd replacement for PID 1, lives in the AUR -NEEDS_YAOURT=1 +FETCH_METHOD="yaourt" # prepare configure for cross-compilation sed -i "s/make /make CC=$TARGET_ARCH-gcc /g" PKGBUILD |