diff options
| -rw-r--r-- | BUGS | 4 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | TODOS | 13 | ||||
| -rwxr-xr-x | create_ca-certificates-utils_shim.sh | 6 | ||||
| -rwxr-xr-x | create_gcc-lib_shim.sh | 6 | ||||
| -rwxr-xr-x | create_glibc_shim.sh | 6 | ||||
| -rw-r--r-- | i486-stage1/binutils/DESCR | 3 |
7 files changed, 18 insertions, 22 deletions
@@ -1,4 +0,0 @@ -bsdtar: /home/cross/i486-root/packages/i486/linux-docs-4.15.1-2-i486.pkg.tar.xz: Not found in archive -bsdtar: /home/cross/i486-root/packages/i486/linux-headers-4.15.1-2-i486.pkg.tar.xz: Not found in archive -bsdtar: Error exit delayed from previous errors. -Built package linux. @@ -166,8 +166,6 @@ su cross ./create_cdrom.sh # basic packages PACKAGES=" \ - fakeroot \ -make mpfr gawk libmpc binutils gcc \ glibc \ # TODO: iputils is for ping only, a little bit too many packages for # that. @@ -5,4 +5,15 @@ - makepkg with an 'alternate root' option (which doens't collide with pacman's options), avoids patching -r and --config into makepkg for stage1 -- shims and provides and depends don't work yet (binutils and glibc-shim) +- shims and provides and depends don't work yet: + - binutils and glibc-shim + - same for gcc-libs: glibc and gcc-libs for gcc +- bsdtar: /home/cross/i486-root/packages/i486/linux-docs-4.15.1-2-i486.pkg.tar.xz: Not found in archive + bsdtar: /home/cross/i486-root/packages/i486/linux-headers-4.15.1-2-i486.pkg.tar.xz: Not found in archive + bsdtar: Error exit delayed from previous errors. + Built package linux. +- gcc PKGBUILD instead of diff +- removing all pacman databases and recreating them with repo-add, also + removing all installed pacman packages seem a little bit paranoic. Find + out how to speed this up and do it properly. + diff --git a/create_ca-certificates-utils_shim.sh b/create_ca-certificates-utils_shim.sh index 2f73102..dbaacbf 100755 --- a/create_ca-certificates-utils_shim.sh +++ b/create_ca-certificates-utils_shim.sh @@ -18,15 +18,13 @@ if test ! -f $STAGE1_CHROOT/packages/$TARGET_CPU/ca-certificates-utils-shim-2017 size=$(du -sk --apparent-size pkg/) size="$(( ${size%%[^0-9]*} * 1024 ))" cat > pkg/ca-certificates-utils-shim/.PKGINFO <<EOF -pkgname = ca-certificates-utils-shim +pkgname = ca-certificates-utils pkgver = 20170307-1 pkgdesc = Common CA certificates (utilities, from host machine) url = http://pkgs.fedoraproject.org/cgit/rpms/ca-certificates.git builddate = $BUILDDATE size = $size arch = any -provides = ca-certificates-utils -conflict = ca-certificates-utils EOF cd pkg/ca-certificates-utils-shim || exit 1 @@ -38,7 +36,7 @@ EOF rm -rf $STAGE1_CHROOT/packages/$TARGET_CPU/temp.db* rm -rf $STAGE1_CHROOT/packages/$TARGET_CPU/temp.files* repo-add $STAGE1_CHROOT/packages/$TARGET_CPU/temp.db.tar.gz $STAGE1_CHROOT/packages/$TARGET_CPU/*pkg.tar.xz - sudo pacman --force --noconfirm --config $STAGE1_CHROOT/etc/pacman.conf -r $STAGE1_CHROOT -Syy ca-certificates-utils-shim + sudo pacman --force --noconfirm --config $STAGE1_CHROOT/etc/pacman.conf -r $STAGE1_CHROOT -Syy ca-certificates-utils fi diff --git a/create_gcc-lib_shim.sh b/create_gcc-lib_shim.sh index 9b5edcc..8652a65 100755 --- a/create_gcc-lib_shim.sh +++ b/create_gcc-lib_shim.sh @@ -25,15 +25,13 @@ if test ! -f $STAGE1_CHROOT/packages/$TARGET_CPU/gcc-libs-shim-7.2.0-1-$TARGET_C size=$(du -sk --apparent-size pkg/) size="$(( ${size%%[^0-9]*} * 1024 ))" cat > pkg/gcc-libs-shim/.PKGINFO <<EOF -pkgname = gcc-libs-shim +pkgname = gcc-libs pkgver = 4.9.4-1 pkgdesc = Runtime libraries shipped by GCC (from crosstool-ng sysroot) url = http://gcc.gnu.org builddate = $BUILDDATE size = $size arch = $TARGET_CPU -provides = gcc-libs -conflict = gcc-libs EOF cd pkg/gcc-libs-shim || exit 1 @@ -45,7 +43,7 @@ EOF rm -rf $STAGE1_CHROOT/packages/$TARGET_CPU/temp.db* rm -rf $STAGE1_CHROOT/packages/$TARGET_CPU/temp.files* repo-add -R $STAGE1_CHROOT/packages/$TARGET_CPU/temp.db.tar.gz $STAGE1_CHROOT/packages/$TARGET_CPU/*pkg.tar.xz - sudo pacman --noconfirm --config $STAGE1_CHROOT/etc/pacman.conf -r $STAGE1_CHROOT -Syy gcc-libs-shim + sudo pacman --noconfirm --config $STAGE1_CHROOT/etc/pacman.conf -r $STAGE1_CHROOT -Syy gcc-libs fi echo "gcc-lib shim exists." diff --git a/create_glibc_shim.sh b/create_glibc_shim.sh index d79d41f..7d16b44 100755 --- a/create_glibc_shim.sh +++ b/create_glibc_shim.sh @@ -55,15 +55,13 @@ if test ! -f $STAGE1_CHROOT/packages/$TARGET_CPU/glibc-shim-2.26-1-$TARGET_CPU.p size=`du -sk --apparent-size pkg/` size="$(( ${size%%[^0-9]*} * 1024 ))" cat > pkg/glibc-shim/.PKGINFO <<EOF -pkgname = glibc-shim +pkgname = glibc pkgver = 2.26-1 pkgdesc = GNU C Library (from crosstool-ng sysroot) url = http://www.gnu.org/software/libc builddate = $BUILDDATE size = $size arch = $TARGET_CPU -provides = glibc -conflict = glibc EOF cd pkg/glibc-shim @@ -75,7 +73,7 @@ EOF rm -rf $STAGE1_CHROOT/packages/$TARGET_CPU/temp.db* rm -rf $STAGE1_CHROOT/packages/$TARGET_CPU/temp.files* repo-add $STAGE1_CHROOT/packages/$TARGET_CPU/temp.db.tar.gz $STAGE1_CHROOT/packages/$TARGET_CPU/*pkg.tar.xz - sudo pacman --force --noconfirm --config $STAGE1_CHROOT/etc/pacman.conf -r $STAGE1_CHROOT -Syy glibc-shim + sudo pacman --force --noconfirm --config $STAGE1_CHROOT/etc/pacman.conf -r $STAGE1_CHROOT -Syy glibc fi diff --git a/i486-stage1/binutils/DESCR b/i486-stage1/binutils/DESCR index cfb98d7..326add7 100644 --- a/i486-stage1/binutils/DESCR +++ b/i486-stage1/binutils/DESCR @@ -1,8 +1,5 @@ # prepare configure for cross-compilation sed -i "/--prefix=\/usr/ a \ --host=$TARGET_ARCH --build=$BUILD_ARCH \\\\" PKGBUILD -# TODO: this should work with glibc-shim providing glibc, but doesn't? -sed -i "/depends=/s/glibc/glibc-shim/" PKGBUILD - # git is still there as build dependency, not needed sed -i "/makedepends=/s/git//" PKGBUILD |