From b5573ca721f4bba4f56934aeb5a3a2388d55c7de Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Mon, 4 Oct 2021 09:23:16 +0200 Subject: [PATCH] monday morning commit --- docker/buildenv/debian/Dockerfile | 2 ++ docker/librewolf/Makefile | 1 + docker/librewolf/debian/deb/Dockerfile | 3 ++ docker/librewolf/debian/deb/Makefile | 22 +++++++------ docker/librewolf/debian/deb/build-deb.sh | 40 ++++++++++++++++++++++++ docker/librewolf/fedora/rpm/Makefile | 24 +++++++------- docker/librewolf/mint/deb/Makefile | 20 +++++++----- docker/librewolf/ubuntu/deb/Makefile | 22 +++++++------ 8 files changed, 95 insertions(+), 39 deletions(-) create mode 100755 docker/librewolf/debian/deb/build-deb.sh diff --git a/docker/buildenv/debian/Dockerfile b/docker/buildenv/debian/Dockerfile index 1951003..afaccf2 100644 --- a/docker/buildenv/debian/Dockerfile +++ b/docker/buildenv/debian/Dockerfile @@ -1,3 +1,5 @@ +# This is Debian 11, codenamed bullseye. + FROM debian MAINTAINER Bert van der Weerd ENV DEBIAN_FRONTEND=noninteractive diff --git a/docker/librewolf/Makefile b/docker/librewolf/Makefile index 9bf8a77..ce5e3e2 100644 --- a/docker/librewolf/Makefile +++ b/docker/librewolf/Makefile @@ -35,3 +35,4 @@ build.macos : make -C macos build.windows : make -C windows + diff --git a/docker/librewolf/debian/deb/Dockerfile b/docker/librewolf/debian/deb/Dockerfile index e7f56ab..0992e29 100644 --- a/docker/librewolf/debian/deb/Dockerfile +++ b/docker/librewolf/debian/deb/Dockerfile @@ -2,3 +2,6 @@ from librewolf/release-debian run ./build.py --version $(cat /version) lw_artifacts run mkdir /artifacts run cp librewolf-$(cat /version).en-US.deb.zip /artifacts +workdir / +copy build-deb.sh / +run ./build-deb.sh diff --git a/docker/librewolf/debian/deb/Makefile b/docker/librewolf/debian/deb/Makefile index e119df7..291339f 100644 --- a/docker/librewolf/debian/deb/Makefile +++ b/docker/librewolf/debian/deb/Makefile @@ -1,4 +1,8 @@ -docker_stage = deb-debian +distro = debian +extractor = extract5 +docker_stage = deb-$(distro) +version = `cat ../version` + all : cache @@ -10,12 +14,12 @@ no-cache : sudo docker build --no-cache -t librewolf/$(docker_stage) . make get_zip -get_zip : artifacts/librewolf-92.0.1.en-US.debian.zip - -artifacts/librewolf-92.0.1.en-US.debian.zip : - sudo docker create --name extract0 librewolf/$(docker_stage) +get_zip : + sudo docker create --name $(extractor) librewolf/$(docker_stage) sudo rm -rf artifacts - sudo docker cp extract0:/artifacts . - sudo docker rm extract0 - sudo mv -v artifacts/librewolf-92.0.1.en-US.deb.zip artifacts/librewolf-92.0.1.en-US.debian.zip - sudo chown user:user artifacts/librewolf-92.0.1.en-US.debian.zip + sudo docker cp $(extractor):/artifacts . + sudo docker rm $(extractor) + sudo mv -v artifacts/librewolf-$(version).en-US.deb.zip artifacts/librewolf-$(version).en-US.$(distro).zip + sudo mv -v artifacts/librewolf.deb artifacts/librewolf-$(version).en-US.$(distro).deb + sudo chown user:user artifacts/librewolf-$(version).en-US.$(distro).zip + sudo chown user:user artifacts/librewolf-$(version).en-US.$(distro).deb diff --git a/docker/librewolf/debian/deb/build-deb.sh b/docker/librewolf/debian/deb/build-deb.sh new file mode 100755 index 0000000..74ff37f --- /dev/null +++ b/docker/librewolf/debian/deb/build-deb.sh @@ -0,0 +1,40 @@ +version=$(cat /version) + +mkdir -p librewolf/DEBIAN +cd librewolf/DEBIAN + +# Depends: libatk1.0-0 (>= 1.12.4), libc6 (>= 2.28), libcairo-gobject2 (>= 1.10.0), libcairo2 (>= 1.10.0), libdbus-1-3 (>= 1.9.14), libdbus-glib-1-2 (>= 0.78), libevent-2.1-6 (>= 2.1.8-stable), libffi6 (>= 3.0.4), libfontconfig1 (>= 2.12.6), libfreetype6 (>= 2.3.5), libgcc1 (>= 1:4.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.31.8), libgtk-3-0 (>= 3.0.0), libpango-1.0-0 (>= 1.14.0), libstdc++6 (>= 6), libx11-6, libx11-xcb1, libxcb-shm0, libxcb1, libxcomposite1 (>= 1:0.3-1), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxrender1, zlib1g (>= 1:1.2.11.dfsg), fontconfig, procps, debianutils (>= 1.16) +# Recommends: libavcodec58 | libavcodec-extra58 | libavcodec57 | libavcodec-extra57 | libavcodec56 | libavcodec-extra56 | libavcodec55 | libavcodec-extra55 | libavcodec54 | libavcodec-extra54 | libavcodec53 | libavcodec-extra53 +# Suggests: fonts-stix | otf-stix, fonts-lmodern, libgssapi-krb5-2 | libkrb53, libcanberra0, libgtk2.0-0, pulseaudio + +cat < control +Architecture: all +Build-Depends: inkscape, librsvg2-bin +Depends: libc6, libgcc1, libstdc++6, wget +Description: The Librewolf browser. +Download-Size: 56.0 MB +Essential: no +Installed-Size: 204 MB +Maintainer: Bert van der Weerd +Package: librewolf +Priority: optional +Provides: gnome-www-browser, www-browser, x-www-browser +Section: web +Version: $version +EOF + +cd .. + +mkdir -p usr/share/librewolf +unzip /artifacts/librewolf-*.zip +mv -v librewolf/* usr/share/librewolf +rmdir librewolf + +mkdir -p usr/bin +cd usr/bin +ln -s ../share/librewolf/librewolf +cd ../.. + +cd .. +dpkg-deb --build librewolf +cp *.deb artifacts diff --git a/docker/librewolf/fedora/rpm/Makefile b/docker/librewolf/fedora/rpm/Makefile index cc99d89..b317cef 100644 --- a/docker/librewolf/fedora/rpm/Makefile +++ b/docker/librewolf/fedora/rpm/Makefile @@ -1,4 +1,8 @@ -docker_stage = rpm-fedora +distro = fedora +extractor = extract1 +docker_stage = rpm-$(distro) +version = `cat ../version` + all : cache @@ -10,16 +14,12 @@ no-cache : sudo docker build --no-cache -t librewolf/$(docker_stage) . make get_zip -no-cache : - sudo docker build --no-cache -t librewolf/$(docker_stage) . - make get_zip +get_zip : artifacts/librewolf-$(version).en-US.$(distro).zip -get_zip : artifacts/librewolf-92.0.1.en-US.fedora.zip - -artifacts/librewolf-92.0.1.en-US.fedora.zip : - sudo docker create --name extract1 librewolf/$(docker_stage) +artifacts/librewolf-$(version).en-US.$(distro).zip : + sudo docker create --name $(extractor) librewolf/$(docker_stage) sudo rm -rf artifacts - sudo docker cp extract1:/artifacts . - sudo docker rm extract1 - sudo mv -v artifacts/librewolf-92.0.1.en-US.deb.zip artifacts/librewolf-92.0.1.en-US.fedora.zip - sudo chown user:user artifacts/librewolf-92.0.1.en-US.fedora.zip + sudo docker cp $(extractor):/artifacts . + sudo docker rm $(extractor) + sudo mv -v artifacts/librewolf-$(version).en-US.deb.zip artifacts/librewolf-$(version).en-US.$(distro).zip + sudo chown user:user artifacts/librewolf-$(version).en-US.$(distro).zip diff --git a/docker/librewolf/mint/deb/Makefile b/docker/librewolf/mint/deb/Makefile index 0269074..8f5c693 100644 --- a/docker/librewolf/mint/deb/Makefile +++ b/docker/librewolf/mint/deb/Makefile @@ -1,4 +1,8 @@ -docker_stage = deb-mint +distro = mint +extractor = extract2 +docker_stage = deb-$(distro) +version = `cat ../version` + all : cache @@ -10,12 +14,12 @@ no-cache : sudo docker build --no-cache -t librewolf/$(docker_stage) . make get_zip -get_zip : artifacts/librewolf-92.0.1.en-US.mint.zip +get_zip : artifacts/librewolf-$(version).en-US.$(distro).zip -artifacts/librewolf-92.0.1.en-US.mint.zip : - sudo docker create --name extract2 librewolf/$(docker_stage) +artifacts/librewolf-$(version).en-US.$(distro).zip : + sudo docker create --name $(extractor) librewolf/$(docker_stage) sudo rm -rf artifacts - sudo docker cp extract2:/artifacts . - sudo docker rm extract2 - sudo mv -v artifacts/librewolf-92.0.1.en-US.deb.zip artifacts/librewolf-92.0.1.en-US.mint.zip - sudo chown user:user artifacts/librewolf-92.0.1.en-US.mint.zip + sudo docker cp $(extractor):/artifacts . + sudo docker rm $(extractor) + sudo mv -v artifacts/librewolf-$(version).en-US.deb.zip artifacts/librewolf-$(version).en-US.$(distro).zip + sudo chown user:user artifacts/librewolf-$(version).en-US.$(distro).zip diff --git a/docker/librewolf/ubuntu/deb/Makefile b/docker/librewolf/ubuntu/deb/Makefile index 1b8514c..ae2bdf2 100644 --- a/docker/librewolf/ubuntu/deb/Makefile +++ b/docker/librewolf/ubuntu/deb/Makefile @@ -1,4 +1,8 @@ -docker_stage = deb-ubuntu +distro = ubuntu +extractor = extract4 +docker_stage = deb-$(distro) +version = `cat ../version` + all : cache @@ -10,14 +14,12 @@ no-cache : sudo docker build --no-cache -t librewolf/$(docker_stage) . make get_zip -get_zip : artifacts/librewolf-92.0.1.en-US.ubuntu.zip +get_zip : artifacts/librewolf-$(version).en-US.$(distro).zip - - -artifacts/librewolf-92.0.1.en-US.ubuntu.zip : - sudo docker create --name extract3 librewolf/$(docker_stage) +artifacts/librewolf-$(version).en-US.$(distro).zip : + sudo docker create --name $(extractor) librewolf/$(docker_stage) sudo rm -rf artifacts - sudo docker cp extract3:/artifacts . - sudo docker rm extract3 - sudo mv -v artifacts/librewolf-92.0.1.en-US.deb.zip artifacts/librewolf-92.0.1.en-US.ubuntu.zip - sudo chown user:user artifacts/librewolf-92.0.1.en-US.ubuntu.zip + sudo docker cp $(extractor):/artifacts . + sudo docker rm $(extractor) + sudo mv -v artifacts/librewolf-$(version).en-US.deb.zip artifacts/librewolf-$(version).en-US.$(distro).zip + sudo chown user:user artifacts/librewolf-$(version).en-US.$(distro).zip