Makefile: Use bsdtar for building rootfs

yuk7 · Feb 9, 2022 · 6f423f5 · 6f423f5
1 parent dc04af2
commit 6f423f5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -11,6 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Install dependencies for build (Apt)
+        shell: bash
+        run: |
+          sudo env DEBIAN_FRONTEND=noninteractive apt update -y && \
+          sudo env DEBIAN_FRONTEND=noninteractive apt install -y libarchive-tools
       - name: Build
         run: |
           make

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,6 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Install dependencies for build (Apt)
+        run: |
+          sudo env DEBIAN_FRONTEND=noninteractive apt update -y && \
+          sudo env DEBIAN_FRONTEND=noninteractive apt install -y libarchive-tools
       - name: Build
         run: |
           make

diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ all: $(OUT_TGZ)
 tgz: $(OUT_TGZ)
 $(OUT_TGZ): rootfinal.tmp
 	@echo -e '\e[1;31mBuilding $(OUT_TGZ)\e[m'
-	cd root.x86_64; sudo tar --xattrs --xattrs-include="security.capability" -zcpf ../$(OUT_TGZ) *
+	cd root.x86_64; sudo bsdtar -zcpf ../$(OUT_TGZ) *
 	sudo chown `id -un` $(OUT_TGZ)
 
 rootfinal.tmp: glibc.tmp fakeroot.tmp locale.tmp
@@ -82,7 +82,7 @@ proc-tmp.tmp: root.x86_64.tmp
 
 root.x86_64.tmp: base.tar.gz
 	@echo -e '\e[1;31mExtracting rootfs...\e[m'
-	sudo tar --xattrs --xattrs-include="security.capability" -zxpf base.tar.gz
+	sudo bsdtar -zxpf base.tar.gz
 	sudo chmod +x root.x86_64
 	touch root.x86_64.tmp