summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-02-13 10:16:59 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2018-02-13 10:16:59 +0100
commit9ae0afbe3afcc22ce9d25002e33c5ff2356e7362 (patch)
tree57d2c0e10a19858f14d41fc6b3cdbca03aaa7602
parentde11dde1ed2ee7892b9e79d404448a965ed0e8dc (diff)
downloadbootstrap32-9ae0afbe3afcc22ce9d25002e33c5ff2356e7362.tar.xz
fixed empty shims
-rw-r--r--TODOS5
-rwxr-xr-xcreate_ca-certificates-utils_shim.sh4
-rwxr-xr-xcreate_gcc-lib_shim.sh4
-rwxr-xr-xcreate_glibc_shim.sh4
4 files changed, 8 insertions, 9 deletions
diff --git a/TODOS b/TODOS
index adb012e..56aa715 100644
--- a/TODOS
+++ b/TODOS
@@ -29,8 +29,6 @@
error: no usable package repositories configured.
installing and listing packages by hand works without problems.
debug: unregistering database 'local'
-- pacman problem: ca-certificates-utils-shim-20170307-1-any definityely contains
- the /etc/ssl/certs/ and the ca-certificates.crt, but it doens't get installed?!
- make: recursive tarkets like all-recursive don't work, neither with cross-compiled
make nor with the recompiled make on the stage1 system.
=> rebuilding bash on the target works, but it's a workaround:
@@ -49,4 +47,5 @@
- stage1 has no bootloader package (syslinux) to install
- do we really want to install stage1 via a CDROM?
- using the cross compiler for syslinux is most likely overkill
-
+- some packages still build more than really needed:
+ - syslinux: builds docu with asciidoc and build EFI stuff from gnu-efi
diff --git a/create_ca-certificates-utils_shim.sh b/create_ca-certificates-utils_shim.sh
index dbaacbf..7f5e8bf 100755
--- a/create_ca-certificates-utils_shim.sh
+++ b/create_ca-certificates-utils_shim.sh
@@ -7,7 +7,7 @@
if test ! -f $STAGE1_CHROOT/packages/$TARGET_CPU/ca-certificates-utils-shim-20170307-1-any.pkg.tar.xz; then
cd $STAGE1_BUILD || exit 1
- rm -rf ca-certificates-utils-shim
+ sudo rm -rf ca-certificates-utils-shim
mkdir ca-certificates-utils-shim
cd ca-certificates-utils-shim || exit 1
@@ -28,7 +28,7 @@ arch = any
EOF
cd pkg/ca-certificates-utils-shim || exit 1
- tar cJvf - .PKGINFO ./* | xz > ../../ca-certificates-utils-shim-20170307-1-any.pkg.tar.xz
+ tar cJvf - .PKGINFO * | xz > ../../ca-certificates-utils-shim-20170307-1-any.pkg.tar.xz
cd ../.. || exit 1
cp -v ./*.pkg.tar.xz $STAGE1_CHROOT/packages/$TARGET_CPU/.
diff --git a/create_gcc-lib_shim.sh b/create_gcc-lib_shim.sh
index 8652a65..a741809 100755
--- a/create_gcc-lib_shim.sh
+++ b/create_gcc-lib_shim.sh
@@ -7,7 +7,7 @@
if test ! -f $STAGE1_CHROOT/packages/$TARGET_CPU/gcc-libs-shim-7.2.0-1-$TARGET_CPU.pkg.tar.xz; then
cd $STAGE1_BUILD || exit 1
- rm -rf gcc-libs-shim
+ sudo rm -rf gcc-libs-shim
mkdir gcc-libs-shim
cd gcc-libs-shim || exit 1
mkdir -p pkg/gcc-libs-shim/usr/lib
@@ -35,7 +35,7 @@ arch = $TARGET_CPU
EOF
cd pkg/gcc-libs-shim || exit 1
- tar cJvf - .PKGINFO ./* | xz > ../../gcc-libs-shim-7.2.0-1-$TARGET_CPU.pkg.tar.xz
+ tar cJvf - .PKGINFO * | xz > ../../gcc-libs-shim-7.2.0-1-$TARGET_CPU.pkg.tar.xz
cd ../.. || exit 1
cp -v ./*.pkg.tar.xz $STAGE1_CHROOT/packages/$TARGET_CPU/.
diff --git a/create_glibc_shim.sh b/create_glibc_shim.sh
index 7d16b44..d91104b 100755
--- a/create_glibc_shim.sh
+++ b/create_glibc_shim.sh
@@ -7,7 +7,7 @@
if test ! -f $STAGE1_CHROOT/packages/$TARGET_CPU/glibc-shim-2.26-1-$TARGET_CPU.pkg.tar.xz; then
cd $STAGE1_BUILD
- rm -rf glibc-shim
+ sudo rm -rf glibc-shim
mkdir glibc-shim
cd glibc-shim
mkdir -p pkg/glibc-shim/usr/include
@@ -51,7 +51,7 @@ if test ! -f $STAGE1_CHROOT/packages/$TARGET_CPU/glibc-shim-2.26-1-$TARGET_CPU.p
cp -a $XTOOLS_ARCH/$TARGET_ARCH/sysroot/usr/share/i18n pkg/glibc-shim/usr/share/.
cp -a $XTOOLS_ARCH/$TARGET_ARCH/sysroot/usr/share/locale pkg/glibc-shim/usr/share/.
- BUILDDATE=`date '+%s'`
+ BUILDDATE=$(date '+%s')
size=`du -sk --apparent-size pkg/`
size="$(( ${size%%[^0-9]*} * 1024 ))"
cat > pkg/glibc-shim/.PKGINFO <<EOF