summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavidovski <david@davidovski.xyz>2022-06-03 23:25:59 +0100
committerdavidovski <david@davidovski.xyz>2022-06-03 23:25:59 +0100
commitab421f4f139b45f7fc6ec14ae4b6b24542e4b7dd (patch)
tree6981e9931ba7e047150edd149b3121c3f5d8ba2c
parent30fa5253773e05e01e2830d039658b9635e9617a (diff)
removed verbosity when removing packages
-rwxr-xr-xxib.sh38
-rwxr-xr-xxib_profile.conf2
2 files changed, 32 insertions, 8 deletions
diff --git a/xib.sh b/xib.sh
index e2aaaff..a7eca0f 100755
--- a/xib.sh
+++ b/xib.sh
@@ -12,7 +12,8 @@ build_profile="/etc/xib_profile.conf"
priv_key="xi.pem"
-buildfiles="$xib_dir/buildfiles"
+buildfiles="/home/david/docs/proj/xilinux/buildfiles"
+#buildfiles="$xib_dir/buildfiles"
seen="$xib_dir/seen"
logs="$xib_dir/logs"
chroot="$xib_dir/chroot"
@@ -23,6 +24,18 @@ keychain="$xib_dir/keychain"
quickfail=true
+usage () {
+ cat << EOF
+${LIGHT_RED}Usage: ${RED}xib [option] [package]
+${BLUE}Avaiable Options:
+ ${BLUE}-d
+ ${LIGHT_CYAN}daemon; run as a daemon, automatically rebuilding all packages
+ ${BLUE}-p
+ ${LIGHT_CYAN}publish; publish packages in the stage to the repo
+${RESET}
+EOF
+}
+
# publish any packages in the stage directory to the repo
#
publish_package () {
@@ -96,7 +109,7 @@ build_package () {
xibuild -v \
-C $1 \
- -d $stage \
+ -o $stage \
-r $chroot \
-l $logs/$name.log \
-k $keychain/$priv_key \
@@ -198,7 +211,7 @@ xib_single () {
&& publish_package \
&& {
[ -e "$chroot/var/lib/xipkg/installed/$name" ] && {
- xi -r $chroot -nyl remove $name
+ xi -r $chroot -nqyl remove $name
} || true
}
}
@@ -256,9 +269,20 @@ xibd () {
[ "$#" = 0 ] && {
xib_all
} || {
- [ "$1" = "-d" ] &&
- xibd || for x in $@; do
- xib_single $x
- done
+ case "$1" in
+ "-d")
+ xibd;;
+ "-p")
+ publish_package
+ ;;
+ "-h")
+ usage
+ ;;
+ *)
+ for x in $@; do
+ xib_single $x
+ done
+ ;;
+ esac
}
diff --git a/xib_profile.conf b/xib_profile.conf
index 6a33a9f..871c0a3 100755
--- a/xib_profile.conf
+++ b/xib_profile.conf
@@ -7,7 +7,7 @@ export MAKEFLAGS=-j$JOBS
export SAMUFLAGS=-j$JOBS
export CARGO_BUILD_JOBS=$JOBS
-export CFLAGS="-pipe -Os -fomit-frame-pointer"
+export CFLAGS="-pipe -O2 -fomit-frame-pointer"
export CXXFLAGS="$CFLAGS"
export CPPFLAGS="$CFLAGS"
export LDFLAGS="-Wl,--as-needed,-O1,--sort-common"