mirrors/apparmor.d
1
0
Fork 0
mirror of https://github.com/roddhjav/apparmor.d.git synced 2024-12-25 06:27:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

build: drop lsb-release build deps.

Browse source
This commit is contained in:
Alexandre Pujol 2023-04-19 18:57:31 +01:00
parent 5af9bab04b
commit ffa0f7bc3d
Failed to generate hash of commit
9 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -60,7 +60,7 @@ archlinux:
stage: build stage: build
image: registry.gitlab.com/roddhjav/builders/archlinux image: registry.gitlab.com/roddhjav/builders/archlinux
script: script:
- sudo pacman -Syu --noconfirm --noprogressbar lsb-release - sudo pacman -Syu --noconfirm --noprogressbar
- makepkg -s --noconfirm --noprogressbar - makepkg -s --noconfirm --noprogressbar
artifacts: artifacts:
expire_in: 1 day expire_in: 1 day
@ -74,7 +74,7 @@ debian:
- git config --global --add safe.directory $CI_PROJECT_DIR - git config --global --add safe.directory $CI_PROJECT_DIR
- VERSION="0.$(git rev-list --count HEAD)-1" - VERSION="0.$(git rev-list --count HEAD)-1"
- mkdir -p "$PKGDEST" - 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 - sudo apt-get install -y -t bullseye-backports golang-go
- dch --newversion=$VERSION --urgency=medium --distribution=stable --controlmaint "Release $VERSION" - dch --newversion=$VERSION --urgency=medium --distribution=stable --controlmaint "Release $VERSION"
- dpkg-buildpackage -b -d --no-sign - dpkg-buildpackage -b -d --no-sign

2
PKGBUILD
View file

@ -12,7 +12,7 @@ arch=("x86_64")
url="https://github.com/roddhjav/$pkgname" url="https://github.com/roddhjav/$pkgname"
license=('GPL2') license=('GPL2')
depends=('apparmor') depends=('apparmor')
makedepends=('go' 'git' 'rsync' 'lsb-release') makedepends=('go' 'git' 'rsync')
conflicts=("$pkgname-git") conflicts=("$pkgname-git")
pkgver() { pkgver() {

1
debian/control vendored
View file

@ -5,7 +5,6 @@ Maintainer: Alexandre Pujol <alexandre@pujol.io>
Build-Depends: debhelper (>= 13.4), Build-Depends: debhelper (>= 13.4),
debhelper-compat (= 13), debhelper-compat (= 13),
golang-any, golang-any,
lsb-release,
config-package-dev, config-package-dev,
rsync, rsync,
Homepage: https://github.com/roddhjav/apparmor.d Homepage: https://github.com/roddhjav/apparmor.d

2
dists/build.sh
View file

@ -80,7 +80,7 @@ build_in_docker_dpkg() {
--env DEBIAN_FRONTEND=noninteractive --env DIST="$dist" \ --env DEBIAN_FRONTEND=noninteractive --env DIST="$dist" \
"$BASEIMAGE/$dist" "$BASEIMAGE/$dist"
docker exec "$img" sudo apt-get update -q 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) [[ "$COMMAND" == debian ]] && aptopt=(-t bullseye-backports)
docker exec "$img" sudo apt-get install -y "${aptopt[@]}" golang-go docker exec "$img" sudo apt-get install -y "${aptopt[@]}" golang-go
fi fi

3
docs/install.md
View file

@ -25,8 +25,7 @@ Also, please note wayland has better support than xorg.
**Build dependencies** **Build dependencies**
* Go * Go >= 1.18
* lsb-release
* Rsync * Rsync
## :material-arch: Archlinux ## :material-arch: Archlinux

1
tests/packer/init/archlinux-gnome.user-data.yml
View file

@ -28,7 +28,6 @@ packages:
- bash-completion - bash-completion
- git - git
- htop - htop
- lsb-release
- man - man
- pass - pass
- python-notify2 - python-notify2

1
tests/packer/init/archlinux-kde.user-data.yml
View file

@ -28,7 +28,6 @@ packages:
- bash-completion - bash-completion
- git - git
- htop - htop
- lsb-release
- man - man
- pass - pass
- python-notify2 - python-notify2

1
tests/packer/init/ubuntu-server.user-data.yml
View file

@ -23,7 +23,6 @@ packages:
- devscripts - devscripts
- golang-go - golang-go
- htop - htop
- lsb-release
- qemu-guest-agent - qemu-guest-agent
- rsync - rsync
- vim - vim

2
tests/packer/src/init.sh
View file

@ -21,7 +21,7 @@ main() {
chown -R "$SUDO_USER:$SUDO_USER" "/home/$SUDO_USER/.config/" chown -R "$SUDO_USER:$SUDO_USER" "/home/$SUDO_USER/.config/"
case "$DISTRIBUTION" in case "$DISTRIBUTION" in
debian | ubuntu) dpkg -i $SRC/apparmor.d_*_all.deb ;; 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 ;; arch) pacman --noconfirm -U $SRC/apparmor.d-*-x86_64.pkg.tar.zst ;;
esac esac
} }