mirror of
https://github.com/roddhjav/apparmor.d.git
synced 2024-12-23 21:46:44 +01:00
build: drop lsb-release build deps.
This commit is contained in:
parent
5af9bab04b
commit
ffa0f7bc3d
9 changed files with 6 additions and 11 deletions
|
@ -60,7 +60,7 @@ archlinux:
|
|||
stage: build
|
||||
image: registry.gitlab.com/roddhjav/builders/archlinux
|
||||
script:
|
||||
- sudo pacman -Syu --noconfirm --noprogressbar lsb-release
|
||||
- sudo pacman -Syu --noconfirm --noprogressbar
|
||||
- makepkg -s --noconfirm --noprogressbar
|
||||
artifacts:
|
||||
expire_in: 1 day
|
||||
|
@ -74,7 +74,7 @@ debian:
|
|||
- git config --global --add safe.directory $CI_PROJECT_DIR
|
||||
- VERSION="0.$(git rev-list --count HEAD)-1"
|
||||
- mkdir -p "$PKGDEST"
|
||||
- sudo apt-get update -q && sudo apt-get install -y lsb-release config-package-dev rsync
|
||||
- sudo apt-get update -q && sudo apt-get install -y config-package-dev rsync
|
||||
- sudo apt-get install -y -t bullseye-backports golang-go
|
||||
- dch --newversion=$VERSION --urgency=medium --distribution=stable --controlmaint "Release $VERSION"
|
||||
- dpkg-buildpackage -b -d --no-sign
|
||||
|
|
2
PKGBUILD
2
PKGBUILD
|
@ -12,7 +12,7 @@ arch=("x86_64")
|
|||
url="https://github.com/roddhjav/$pkgname"
|
||||
license=('GPL2')
|
||||
depends=('apparmor')
|
||||
makedepends=('go' 'git' 'rsync' 'lsb-release')
|
||||
makedepends=('go' 'git' 'rsync')
|
||||
conflicts=("$pkgname-git")
|
||||
|
||||
pkgver() {
|
||||
|
|
1
debian/control
vendored
1
debian/control
vendored
|
@ -5,7 +5,6 @@ Maintainer: Alexandre Pujol <alexandre@pujol.io>
|
|||
Build-Depends: debhelper (>= 13.4),
|
||||
debhelper-compat (= 13),
|
||||
golang-any,
|
||||
lsb-release,
|
||||
config-package-dev,
|
||||
rsync,
|
||||
Homepage: https://github.com/roddhjav/apparmor.d
|
||||
|
|
|
@ -80,7 +80,7 @@ build_in_docker_dpkg() {
|
|||
--env DEBIAN_FRONTEND=noninteractive --env DIST="$dist" \
|
||||
"$BASEIMAGE/$dist"
|
||||
docker exec "$img" sudo apt-get update -q
|
||||
docker exec "$img" sudo apt-get install -y lsb-release config-package-dev rsync
|
||||
docker exec "$img" sudo apt-get install -y config-package-dev rsync
|
||||
[[ "$COMMAND" == debian ]] && aptopt=(-t bullseye-backports)
|
||||
docker exec "$img" sudo apt-get install -y "${aptopt[@]}" golang-go
|
||||
fi
|
||||
|
|
|
@ -25,8 +25,7 @@ Also, please note wayland has better support than xorg.
|
|||
|
||||
**Build dependencies**
|
||||
|
||||
* Go
|
||||
* lsb-release
|
||||
* Go >= 1.18
|
||||
* Rsync
|
||||
|
||||
## :material-arch: Archlinux
|
||||
|
|
|
@ -28,7 +28,6 @@ packages:
|
|||
- bash-completion
|
||||
- git
|
||||
- htop
|
||||
- lsb-release
|
||||
- man
|
||||
- pass
|
||||
- python-notify2
|
||||
|
|
|
@ -28,7 +28,6 @@ packages:
|
|||
- bash-completion
|
||||
- git
|
||||
- htop
|
||||
- lsb-release
|
||||
- man
|
||||
- pass
|
||||
- python-notify2
|
||||
|
|
|
@ -23,7 +23,6 @@ packages:
|
|||
- devscripts
|
||||
- golang-go
|
||||
- htop
|
||||
- lsb-release
|
||||
- qemu-guest-agent
|
||||
- rsync
|
||||
- vim
|
||||
|
|
|
@ -21,7 +21,7 @@ main() {
|
|||
chown -R "$SUDO_USER:$SUDO_USER" "/home/$SUDO_USER/.config/"
|
||||
case "$DISTRIBUTION" in
|
||||
debian | ubuntu) dpkg -i $SRC/apparmor.d_*_all.deb ;;
|
||||
opensuse*) zypper install -y bash-completion git go htop lsb-release make rsync vim ;;
|
||||
opensuse*) zypper install -y bash-completion git go htop make rsync vim ;;
|
||||
arch) pacman --noconfirm -U $SRC/apparmor.d-*-x86_64.pkg.tar.zst ;;
|
||||
esac
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue