Remove flavor configuration.

This commit is contained in:
Alexandre Pujol 2021-04-04 21:38:07 +01:00
parent f3a982fdf6
commit 18f56603b3
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
3 changed files with 3 additions and 18 deletions

View file

@ -18,7 +18,7 @@ prepare() {
git clone "$startdir" "$srcdir/$pkgname" git clone "$startdir" "$srcdir/$pkgname"
cd "$srcdir/$pkgname" cd "$srcdir/$pkgname"
./configure --distribution=archlinux --flavor=desktop ./configure --distribution=archlinux
} }
package() { package() {

17
configure vendored
View file

@ -45,19 +45,6 @@ configure() {
fi fi
echo "Set the configuration for a $FLAVOR."
if [[ "$FLAVOR" == server ]]; then
REMOVE_LIST+=(
apparmor.d/groups/apps
apparmor.d/groups/browsers
apparmor.d/groups/desktop
apparmor.d/groups/gnome
apparmor.d/groups/gvfs
apparmor.d/groups/network/NetworkManager
apparmor.d/groups/network/nm-*
)
fi
} }
# Initialise the apparmor.d with the selected configuration. # Initialise the apparmor.d with the selected configuration.
@ -110,19 +97,17 @@ cmd_help() {
Options: Options:
--distribution=DIST Set the target Linux distribution (Archlinux, Debian) --distribution=DIST Set the target Linux distribution (Archlinux, Debian)
--flavor=FLAVOR Special flavor specific configuration (desktop, server)
--help Print this help message and exit. --help Print this help message and exit.
_EOF _EOF
} }
main() { main() {
local opts err local opts err
opts="$(getopt -o h -l distribution:,flavor:,groups:,help -n "$PROGRAM" -- "$@")" opts="$(getopt -o h -l distribution:,help -n "$PROGRAM" -- "$@")"
err=$? err=$?
eval set -- "$opts" eval set -- "$opts"
while true; do case $1 in while true; do case $1 in
--distribution) DISTRIBUTION="$2"; shift 2 ;; --distribution) DISTRIBUTION="$2"; shift 2 ;;
--flavor) FLAVOR="$2"; shift 2 ;;
-h|--help) shift; cmd_help; exit 0 ;; -h|--help) shift; cmd_help; exit 0 ;;
--) shift; break ;; --) shift; break ;;
esac done esac done

2
debian/rules vendored
View file

@ -9,7 +9,7 @@
dh $@ --with=config-package dh $@ --with=config-package
override_dh_auto_configure: override_dh_auto_configure:
./configure --distribution=debian --flavor=desktop ./configure --distribution=debian
override_dh_install: override_dh_install:
find systemd/ -type f -exec \ find systemd/ -type f -exec \