build-devtoolbox: Skip rhpkg for Fedora 33

[bin.git] / debdev

diff --git a/debdev b/debdev
index 3724948fdefff17b0f94bed6c2645c51d59e0e4d..b1a36192319537acae26c469d22cc7ad79703938 100755 (executable)
--- a/debdev
+++ b/debdev
@@ -3,15 +3,18 @@ set -e
 schroot="$1"
 
 if [ -z "$schroot" ]; then
-    echo "Usage: $0 <schroot>" >&2
+    echo "Usage: $0 <schroot> [command]" >&2
     exit 1
 fi
 
 SESSID="schroot-debdev-$schroot"
 if ! schroot -la | grep -q "session:$SESSID"; then
     schroot -b -c "$schroot" -n "$SESSID"
-    schroot -r -c session:$SESSID -u root -- apt-get install --no-install-recommends -o Dpkg::Options::="--force-confnew" -y git-buildpackage libwww-perl less vim lintian debhelper manpages-dev git dput pristine-tar bash-completion libnss-myhostname lptools python-keyrings.alt wget gnupg2 ubuntu-dev-tools
+    # work around for system groups
+    schroot -r -c session:$SESSID -u root -- addgroup --system staff || true
+    schroot -r -c session:$SESSID -u root -- apt-get install --no-install-recommends -o Dpkg::Options::="--force-confnew" -y git-buildpackage libwww-perl less vim lintian debhelper manpages-dev git dput pristine-tar bash-completion libnss-myhostname wget gnupg ubuntu-dev-tools python3-debian qemu-kvm qemu-utils
+    schroot -r -c session:$SESSID -u root -- apt-get install -y locales-all || true
     #sudo mount -o bind /etc/schroot/ $(schroot --location -c session:$SESSID)/etc/schroot/
-    #sudo mount -o bind /srv/ $(schroot --location -c session:$SESSID)/srv
 fi
-schroot -r -c session:$SESSID
+shift
+schroot -r -c session:$SESSID "$@"