From bd71b54545818922d94fe297521e7c4a87347509 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Wed, 11 Mar 2020 10:32:41 -0600
Subject: [PATCH] Update pkgar
---
.gitignore | 1 +
cook.sh | 14 +++++---------
pkgar | 2 +-
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
index de50c96e9..ad5e33ded 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ source
source-new
source.tar
stage
+stage.pkg
stage.sig
stage.tar
stage.tar.gz
diff --git a/cook.sh b/cook.sh
index aa19f96d7..0911d2664 100755
--- a/cook.sh
+++ b/cook.sh
@@ -42,6 +42,8 @@ function usage {
echo " difftool_upstream" >&2
echo " fetch" >&2
echo " unfetch" >&2
+ echo " pkg" >&2
+ echo " unpkg" >&2
echo " prepare" >&2
echo " unprepare" >&2
echo " publish" >&2
@@ -69,8 +71,10 @@ function op {
op $1 build
op $1 stage
op $1 tar
+ op $1 pkg
;;
distclean)
+ op $1 unpkg
op $1 untar
op $1 unstage
op $1 unprepare
@@ -440,17 +444,9 @@ function op {
--secret "${ROOT}/build/secret.key" \
--file stage.pkg \
stage
-
- if command -v pigz > /dev/null
- then
- pigz --force stage.pkg
- else
- echo "Install pigz for increased performance"
- gzip --force recipes/jeremy/stage.pkg
- fi
;;
unpkg)
- rm -fv stage.pkg stage.pkg.gz
+ rm -fv stage.pkg
;;
tar)
echo "name = \"$1\"" > "stage.toml"
diff --git a/pkgar b/pkgar
index 6855ee50a..d3b5dfc7a 160000
--- a/pkgar
+++ b/pkgar
@@ -1 +1 @@
-Subproject commit 6855ee50a3beda271975aebce50196ebdb75d442
+Subproject commit d3b5dfc7af711f32ca115bc39d45f77dac4b7b99
--
GitLab