build: various cleanup
This commit is contained in:
parent
e43d907808
commit
7963479dbc
4 changed files with 6 additions and 5 deletions
|
|
@ -16,7 +16,7 @@ readonly VERSION
|
||||||
main() {
|
main() {
|
||||||
case "$COMMAND" in
|
case "$COMMAND" in
|
||||||
pkg)
|
pkg)
|
||||||
PKGDEST="$OUTPUT" makepkg --syncdeps --force --cleanbuild --noconfirm --noprogressbar
|
PKGDEST="$OUTPUT" BUILDDIR=/tmp/makepkg makepkg --syncdeps --force --cleanbuild --noconfirm --noprogressbar
|
||||||
;;
|
;;
|
||||||
|
|
||||||
dpkg)
|
dpkg)
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ readonly VERSION PACKAGER
|
||||||
|
|
||||||
_start() {
|
_start() {
|
||||||
local img="$1"
|
local img="$1"
|
||||||
docker start "$img"
|
docker start "$img" || return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
_is_running() {
|
_is_running() {
|
||||||
|
|
@ -65,7 +65,7 @@ build_in_docker_makepkg() {
|
||||||
--env PKGDEST="$BUILDIR" --env PACKAGER="$PACKAGER" \
|
--env PKGDEST="$BUILDIR" --env PACKAGER="$PACKAGER" \
|
||||||
--env BUILDDIR=/tmp/build \
|
--env BUILDDIR=/tmp/build \
|
||||||
"$BASEIMAGE/$dist"
|
"$BASEIMAGE/$dist"
|
||||||
docker exec "$img" sudo pacman -Syu --noconfirm --noprogressbar
|
docker exec "$img" sudo pacman -Sy --noconfirm --noprogressbar
|
||||||
fi
|
fi
|
||||||
|
|
||||||
docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh pkg
|
docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh pkg
|
||||||
|
|
|
||||||
|
|
@ -230,7 +230,7 @@ lvmdump complain
|
||||||
lvmpolld complain
|
lvmpolld complain
|
||||||
man complain
|
man complain
|
||||||
mate-notification-daemon complain
|
mate-notification-daemon complain
|
||||||
mdadm complain
|
mdadm attach_disconnected,complain
|
||||||
mdadm-mkconf complain
|
mdadm-mkconf complain
|
||||||
ModemManager attach_disconnected,complain
|
ModemManager attach_disconnected,complain
|
||||||
mount attach_disconnected,complain
|
mount attach_disconnected,complain
|
||||||
|
|
@ -327,7 +327,7 @@ systemd-generator-ds-identify attach_disconnected,complain
|
||||||
systemd-generator-environment-arch complain
|
systemd-generator-environment-arch complain
|
||||||
systemd-generator-environment-flatpak complain
|
systemd-generator-environment-flatpak complain
|
||||||
systemd-generator-environment-snapd attach_disconnected,complain
|
systemd-generator-environment-snapd attach_disconnected,complain
|
||||||
systemd-generator-friendly-recover attach_disconnected,complain
|
systemd-generator-friendly-recovery attach_disconnected,complain
|
||||||
systemd-generator-fstab attach_disconnected,complain
|
systemd-generator-fstab attach_disconnected,complain
|
||||||
systemd-generator-getty attach_disconnected,complain
|
systemd-generator-getty attach_disconnected,complain
|
||||||
systemd-generator-gpt-auto attach_disconnected,complain
|
systemd-generator-gpt-auto attach_disconnected,complain
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ apt-helper complain
|
||||||
check-new-release-gtk complain
|
check-new-release-gtk complain
|
||||||
do-release-upgrade complain
|
do-release-upgrade complain
|
||||||
dpkg-genbuildinfo complain
|
dpkg-genbuildinfo complain
|
||||||
|
esm_cache complain
|
||||||
fanctl attach_disconnected,complain
|
fanctl attach_disconnected,complain
|
||||||
hwe-support-status complain
|
hwe-support-status complain
|
||||||
list-oem-metapackages complain
|
list-oem-metapackages complain
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue