From d6185833904c60d3b1e6d892916ece2a5d69443b Mon Sep 17 00:00:00 2001 From: Alexandre Pujol Date: Sat, 15 Oct 2022 23:14:09 +0100 Subject: [PATCH] buid(debian): remove config-package build deps. --- .github/workflows/main.yml | 3 +-- .gitlab-ci.yml | 2 +- README.md | 2 +- debian/control | 3 +-- dists/build/debian/Dockerfile | 2 +- dists/build/ubuntu/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6ad274f6..1fd89480 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,8 +14,7 @@ jobs: run: | sudo apt-get update -q sudo apt-get install -y \ - devscripts debhelper config-package-dev \ - auditd apparmor-profiles + devscripts debhelper auditd apparmor-profiles sudo rm /etc/apparmor.d/usr.lib.snapd.snap-confine.real - name: Build the apparmor.d package diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4380ed65..360ce717 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,7 +73,7 @@ debian: script: - VERSION="$(date +%y.%m%d)-1" - mkdir -p "$PKGDEST" - - sudo apt-get update -q && sudo apt-get install -y golang-go lsb-release config-package-dev rsync + - sudo apt-get update -q && sudo apt-get install -y golang-go lsb-release rsync - dch --newversion=$VERSION --urgency=medium --distribution=stable --controlmaint "Release $VERSION" - dpkg-buildpackage -b -d --no-sign - mv ../*.deb $PKGDEST/ diff --git a/README.md b/README.md index 87e10c34..dd4cdeea 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ The `PKGBUILD` included in this repository is intended for development only. Build using standard Debian package build tools: ```sh -sudo apt install apparmor-profiles build-essential config-package-dev debhelper golang-go rsync git +sudo apt install apparmor-profiles build-essential debhelper golang-go rsync git git clone https://github.com/roddhjav/apparmor.d.git cd apparmor.d dpkg-buildpackage -b -d --no-sign diff --git a/debian/control b/debian/control index bc12c096..d9b80b57 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Build-Depends: debhelper (>= 13.4), debhelper-compat (= 13), golang-any, lsb-release, - config-package-dev, rsync, Homepage: https://github.com/roddhjav/apparmor.d Vcs-Browser: https://github.com/roddhjav/apparmor.d @@ -17,4 +16,4 @@ Rules-Requires-Root: no Package: apparmor.d Architecture: all Depends: apparmor-profiles, ${misc:Depends} -Description: Full set of AppArmor profiles (~ 1000 profiles) \ No newline at end of file +Description: Full set of AppArmor profiles (~ 1400 profiles) \ No newline at end of file diff --git a/dists/build/debian/Dockerfile b/dists/build/debian/Dockerfile index 85f8c2cf..be919323 100644 --- a/dists/build/debian/Dockerfile +++ b/dists/build/debian/Dockerfile @@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND=noninteractive \ RUN echo 'deb http://deb.debian.org/debian bullseye-backports main contrib non-free' >> /etc/apt/sources.list && \ apt-get update -y && apt-get -qq -y --no-install-recommends upgrade && \ apt-get -qq -y --no-install-recommends install \ - build-essential devscripts debhelper fakeroot config-package-dev \ + build-essential devscripts debhelper fakeroot \ git lsb-release rsync && \ apt-get -qq -y --no-install-recommends install \ golang-1.19-go -t bullseye-backports && \ diff --git a/dists/build/ubuntu/Dockerfile b/dists/build/ubuntu/Dockerfile index aea5f447..788b59b2 100644 --- a/dists/build/ubuntu/Dockerfile +++ b/dists/build/ubuntu/Dockerfile @@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive \ # hadolint ignore=DL3008 RUN apt-get update -y && apt-get -qq -y --no-install-recommends upgrade && \ apt-get -qq -y --no-install-recommends install \ - build-essential devscripts debhelper fakeroot config-package-dev \ + build-essential devscripts debhelper fakeroot \ git lsb-release rsync golang-go && \ apt-get -qy autoremove && \ apt-get -qq --purge remove -y .\*-doc$ && \