Skip to content

Commit

Permalink
packages: improve isolation and cleanup (#4)
Browse files Browse the repository at this point in the history
* bins: exclude librt and libresolv from package content

* bins: auto append arch and z4 (zos-v4) to package name

Appending -amd64-z4 will prevent overwriting packages from zos-v3

* bins: exclude libm as well

* bins: skip tpm package for now (too many dependencies libs included)
  • Loading branch information
maxux authored Sep 4, 2024
1 parent 712a314 commit 9b6b198
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/bins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ jobs:
package: nnc
secrets:
token: ${{ secrets.HUB_JWT }}
tpm:
uses: ./.github/workflows/bin-package-18.04.yaml
with:
package: tpm
secrets:
token: ${{ secrets.HUB_JWT }}
# tpm:
# uses: ./.github/workflows/bin-package-18.04.yaml
# with:
# package: tpm
# secrets:
# token: ${{ secrets.HUB_JWT }}
qsfs:
uses: ./.github/workflows/bin-package-no-tag.yaml
with:
Expand Down
5 changes: 4 additions & 1 deletion bins/bins-extra.sh
Original file line number Diff line number Diff line change
Expand Up @@ -263,13 +263,16 @@ exclude_libs() {
echo "[+] excluding host critical libs"
rm -rf ${ROOTDIR}/usr/lib/ld-linux*
rm -rf ${ROOTDIR}/usr/lib/libc.*
rm -rf ${ROOTDIR}/usr/lib/libm.*
rm -rf ${ROOTDIR}/usr/lib/libdl.*
rm -rf ${ROOTDIR}/usr/lib/librt.*
rm -rf ${ROOTDIR}/usr/lib/libresolv.*
rm -rf ${ROOTDIR}/usr/lib/libpthread.*
}

github_name() {
# force github print
echo "name=${1}" >> $GITHUB_OUTPUT
echo "name=${1}-amd64-z4" >> $GITHUB_OUTPUT
echo "[+] github exported name: ${1}"
}

Expand Down

0 comments on commit 9b6b198

Please sign in to comment.