diff options
| -rwxr-xr-x | bootstrap/bootstrap.sh | 6 | ||||
| -rwxr-xr-x | xib_env | 2 | ||||
| -rwxr-xr-x | xibuild/build_package.sh | 22 |
3 files changed, 24 insertions, 6 deletions
diff --git a/bootstrap/bootstrap.sh b/bootstrap/bootstrap.sh index 71e2fab..cda42d5 100755 --- a/bootstrap/bootstrap.sh +++ b/bootstrap/bootstrap.sh @@ -4,13 +4,13 @@ ## VERSIONS ## # TODO move to a different package -LINUX_VER=5.17.1 +LINUX_VER=5.17.2 BINUTILS_VER=2.38 MPFR_VER=4.1.0 MPC_VER=1.2.1 GMP_VER=6.2.1 GCC_VER=11.2.0 -MUSL_VER=1.2.2 +MUSL_VER=1.2.3 FILE_VER=5.41 TCL_VER=8.6.12 M4_VER=1.4.19 @@ -29,7 +29,7 @@ GZIP_VER=1.11 MAKE_VER=4.3 PATCH_VER=2.7.6 SED_VER=4.8 -PERL_VER=5.34.0 +PERL_VER=5.34.1 TEXINFO_VER=6.8 FLEX_VER=2.6.4 PERL_CROSS_VER=1.3.6 @@ -9,6 +9,7 @@ export XIB_DIR="/var/lib/xib" export XIB_BUILDFILES="$XIB_DIR/buildfiles" export XIB_CHROOT="$XIB_DIR/chroot" export XIB_EXPORT="$XIB_DIR/export" +export LOG_FILE="$XIB_DIR/xib.log" export PRIV_KEY="/home/david/.ssh/xi.pem" export PUB_KEY="/home/david/.ssh/xi.pub" @@ -19,4 +20,3 @@ export BUILDFILES_GIT_REPO="https://xi.davidovski.xyz/git/buildfiles.git" export INSTALLED_PACKAGES="$XIB_CHROOT/installed" export BUILD_PROFILE=$XIB_DIR/build_profile - diff --git a/xibuild/build_package.sh b/xibuild/build_package.sh index f061ad9..e09aecd 100755 --- a/xibuild/build_package.sh +++ b/xibuild/build_package.sh @@ -195,17 +195,31 @@ package_dest () { cp "$BUILDFILE" "$XIB_EXPORT/repo/$REPO/" } +# strip debug symbols +# +strip_dest () { + local pkg_dest="$XIB_CHROOT/export" + for file in \ + $(find $pkg_dest/ -type f -name \*.so* ! -name \*dbg) \ + $(find $pkg_dest/ -type f -name \*.a) \ + $(find $pkg_dest/ -type f -executable ); do + strip --strip-unneeded $file + done + + find $pkg_dest -name \*.la -delete +} + # build the package # build_pkg () { local log_file="$XIB_EXPORT/repo/$REPO/$NAME.log" printf "${BLUE}${TABCHAR}prepare " - prepare_build_env || return 1 + prepare_build_env || return 1 printf "${GREEN}${CHECKMARK}\n" printf "${BLUE}${TABCHAR}fetch " - fetch_source || return 1 + fetch_source || return 1 printf "${GREEN}${CHECKMARK}${RESET}${INFOCHAR}$(du -sh "$XIB_CHROOT/build/source" | awk '{ print $1 }')\n" printf "${BLUE}${TABCHAR}generate " @@ -216,6 +230,10 @@ build_pkg () { xichroot $XIB_CHROOT /build/build.sh > $log_file 2>&1 || return 1 printf "${GREEN}${CHECKMARK}\n" + printf "${BLUE}${TABCHAR}clean " + strip_dest > $log_file 2>&1 || return 1 + printf "${GREEN}${CHECKMARK}\n" + printf "${BLUE}${TABCHAR}package " package_dest || return 1 printf "${GREEN}${CHECKMARK}${RESET}${INFOCHAR}$(du -sh "$XIB_EXPORT/repo/$REPO/$NAME.xipkg" | awk '{ print $1 }')!\n" |