From a5da8de1f90f95625bb803f94739822fb804970e Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Wed, 6 Oct 2021 16:32:00 +0200 Subject: [PATCH] final touches on fedora34 build target --- .gitignore | 2 +- docker/Makefile | 12 ++++++------ docker/buildenv/Makefile | 2 +- docker/buildenv/fedora/Makefile | 2 -- docker/buildenv/{fedora => fedora34}/Dockerfile | 0 docker/buildenv/fedora34/Makefile | 2 ++ docker/librewolf/Makefile | 12 ++++++------ docker/librewolf/fedora/Makefile | 10 ---------- docker/librewolf/{fedora => fedora34}/.gitignore | 0 docker/librewolf/{fedora => fedora34}/Dockerfile | 2 +- docker/librewolf/fedora34/Makefile | 10 ++++++++++ docker/librewolf/{fedora => fedora34}/rpm/Dockerfile | 2 +- docker/librewolf/{fedora => fedora34}/rpm/Makefile | 10 +++++----- .../librewolf/{fedora => fedora34}/rpm/build-rpm.sh | 4 +++- .../{fedora => fedora34}/rpm/librewolf.spec | 0 15 files changed, 36 insertions(+), 34 deletions(-) delete mode 100644 docker/buildenv/fedora/Makefile rename docker/buildenv/{fedora => fedora34}/Dockerfile (100%) create mode 100644 docker/buildenv/fedora34/Makefile delete mode 100644 docker/librewolf/fedora/Makefile rename docker/librewolf/{fedora => fedora34}/.gitignore (100%) rename docker/librewolf/{fedora => fedora34}/Dockerfile (95%) create mode 100644 docker/librewolf/fedora34/Makefile rename docker/librewolf/{fedora => fedora34}/rpm/Dockerfile (90%) rename docker/librewolf/{fedora => fedora34}/rpm/Makefile (79%) rename docker/librewolf/{fedora => fedora34}/rpm/build-rpm.sh (90%) rename docker/librewolf/{fedora => fedora34}/rpm/librewolf.spec (100%) diff --git a/.gitignore b/.gitignore index 8f28789..ceea83d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,6 @@ build_tag /docker/librewolf/debian10/deb/artifacts /docker/librewolf/debian11/deb/artifacts -/docker/librewolf/fedora/rpm/artifacts +/docker/librewolf/fedora34/rpm/artifacts /docker/librewolf/mint20/deb/artifacts /docker/librewolf/ubuntu20/deb/artifacts diff --git a/docker/Makefile b/docker/Makefile index 3eaa276..425af63 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -2,7 +2,7 @@ all : lw help : @echo "Use: make all clean lw prune mozilla full" - @echo " make debian fedora mint ubuntu" + @echo " make debian10 debian11 fedora34 mint20 ubuntu20" clean : rm -f librewolf/version release/version @@ -38,10 +38,10 @@ debian11 : make -C buildenv/debian11 cp version librewolf/debian11 make -C librewolf/debian11 -fedora : - make -C buildenv/fedora - cp version librewolf/fedora - make -C librewolf/fedora +fedora34 : + make -C buildenv/fedora34 + cp version librewolf/fedora34 + make -C librewolf/fedora34 mint20 : make -C buildenv/mint20 cp version librewolf/mint20 @@ -59,7 +59,7 @@ low_disk : make prune make debian11 make prune - make fedora + make fedora34 make prune make mint20 make prunt diff --git a/docker/buildenv/Makefile b/docker/buildenv/Makefile index f24a792..c105446 100644 --- a/docker/buildenv/Makefile +++ b/docker/buildenv/Makefile @@ -1,6 +1,6 @@ all : make -C debian10 make -C debian11 - make -C fedora + make -C fedora34 make -C mint20 make -C ubuntu20 diff --git a/docker/buildenv/fedora/Makefile b/docker/buildenv/fedora/Makefile deleted file mode 100644 index 638fb5d..0000000 --- a/docker/buildenv/fedora/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -all : - sudo docker build -t mozilla/buildenv-fedora . diff --git a/docker/buildenv/fedora/Dockerfile b/docker/buildenv/fedora34/Dockerfile similarity index 100% rename from docker/buildenv/fedora/Dockerfile rename to docker/buildenv/fedora34/Dockerfile diff --git a/docker/buildenv/fedora34/Makefile b/docker/buildenv/fedora34/Makefile new file mode 100644 index 0000000..d71a668 --- /dev/null +++ b/docker/buildenv/fedora34/Makefile @@ -0,0 +1,2 @@ +all : + sudo docker build -t mozilla/buildenv-fedora34 . diff --git a/docker/librewolf/Makefile b/docker/librewolf/Makefile index d1d99d7..6fd1ade 100644 --- a/docker/librewolf/Makefile +++ b/docker/librewolf/Makefile @@ -3,7 +3,7 @@ all : cp ../version . - cp version debian10/version && cp version debian11/version && cp version fedora/version && cp version ubuntu20/version && cp version mint20/version && cp version arch && cp version macos && cp version windows && cp version portable-linux + cp version debian10/version && cp version debian11/version && cp version fedora34/version && cp version ubuntu20/version && cp version mint20/version && cp version arch && cp version macos && cp version windows && cp version portable-linux make -C arch make -C macos @@ -12,17 +12,17 @@ all : make -C debian10 make -C debian11 - make -C fedora + make -C fedora34 make -C mint20 make -C ubuntu20 clean : - rm -f version debian10/version debian11/version fedora/version ubuntu20/version mint20/version arch/version macos/version windows/version portable-linux/version + rm -f version debian10/version debian11/version fedora34/version ubuntu20/version mint20/version arch/version macos/version windows/version portable-linux/version make -C portable-linux clean make -C debian10 clean make -C debian11 clean - make -C fedora clean + make -C fedora34 clean make -C mint20 clean make -C ubuntu20 clean @@ -30,8 +30,8 @@ build.debian10 : make -C debian10 build.debian11 : make -C debian11 -build.fedora : - make -C fedora +build.fedora34 : + make -C fedora34 build.mint20 : make -C mint20 build.ubuntu : diff --git a/docker/librewolf/fedora/Makefile b/docker/librewolf/fedora/Makefile deleted file mode 100644 index 59dffa0..0000000 --- a/docker/librewolf/fedora/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -all : - sudo docker build -t librewolf/release-fedora . - make -C rpm all - -no-cache : - sudo docker build --no-cache -t librewolf/release-fedora . - make -C rpm no-cache - -clean : - make -C rpm clean diff --git a/docker/librewolf/fedora/.gitignore b/docker/librewolf/fedora34/.gitignore similarity index 100% rename from docker/librewolf/fedora/.gitignore rename to docker/librewolf/fedora34/.gitignore diff --git a/docker/librewolf/fedora/Dockerfile b/docker/librewolf/fedora34/Dockerfile similarity index 95% rename from docker/librewolf/fedora/Dockerfile rename to docker/librewolf/fedora34/Dockerfile index c842172..ce66590 100644 --- a/docker/librewolf/fedora/Dockerfile +++ b/docker/librewolf/fedora34/Dockerfile @@ -1,4 +1,4 @@ -from mozilla/buildenv-fedora +from mozilla/buildenv-fedora34 run rm -rf mozilla-unified # Build it.. diff --git a/docker/librewolf/fedora34/Makefile b/docker/librewolf/fedora34/Makefile new file mode 100644 index 0000000..462f556 --- /dev/null +++ b/docker/librewolf/fedora34/Makefile @@ -0,0 +1,10 @@ +all : + sudo docker build -t librewolf/release-fedora34 . + make -C rpm all + +no-cache : + sudo docker build --no-cache -t librewolf/release-fedora34 . + make -C rpm no-cache + +clean : + make -C rpm clean diff --git a/docker/librewolf/fedora/rpm/Dockerfile b/docker/librewolf/fedora34/rpm/Dockerfile similarity index 90% rename from docker/librewolf/fedora/rpm/Dockerfile rename to docker/librewolf/fedora34/rpm/Dockerfile index ec56e90..b51ccd1 100644 --- a/docker/librewolf/fedora/rpm/Dockerfile +++ b/docker/librewolf/fedora34/rpm/Dockerfile @@ -1,4 +1,4 @@ -from librewolf/release-fedora +from librewolf/release-fedora34 run ./build.py --version $(cat /version) lw_artifacts run mkdir /artifacts diff --git a/docker/librewolf/fedora/rpm/Makefile b/docker/librewolf/fedora34/rpm/Makefile similarity index 79% rename from docker/librewolf/fedora/rpm/Makefile rename to docker/librewolf/fedora34/rpm/Makefile index 6a0dc64..e2d101f 100644 --- a/docker/librewolf/fedora/rpm/Makefile +++ b/docker/librewolf/fedora34/rpm/Makefile @@ -1,7 +1,7 @@ -distro = fedora -extractor = extract1 +distro = fedora34 +extractor = extract12 docker_stage = rpm-$(distro) -version = `cat version` +version = `cat ../version` all : cache @@ -31,6 +31,6 @@ artifacts/build_tag : sudo docker rm $(extractor) sudo mv -v artifacts/librewolf-$(version).en-US.rpm.zip artifacts/librewolf-$(version).en-US.$(distro).zip sudo chown user:user artifacts/librewolf-$(version).en-US.$(distro).zip - sudo chown user:user artifacts/librewolf-$(version)-1.fc34.x86_64.rpm - scp artifacts/*.rpm vps:pub/pub/librewolf + sudo chown user:user artifacts/librewolf-$(version)*.rpm + scp artifacts/librewolf-$(version)*.rpm vps:pub/pub/librewolf diff --git a/docker/librewolf/fedora/rpm/build-rpm.sh b/docker/librewolf/fedora34/rpm/build-rpm.sh similarity index 90% rename from docker/librewolf/fedora/rpm/build-rpm.sh rename to docker/librewolf/fedora34/rpm/build-rpm.sh index 4b0c800..45a571f 100755 --- a/docker/librewolf/fedora/rpm/build-rpm.sh +++ b/docker/librewolf/fedora34/rpm/build-rpm.sh @@ -57,5 +57,7 @@ echo '---' echo "[debug] Running rpmbuild.." echo '---' -rpmbuild -v -bb $(pwd)/rpmbuild/SPECS/librewolf.spec +rpmbuild -v -ba $(pwd)/rpmbuild/SPECS/librewolf.spec +echo '--- [debug] Copying output files to /artifacts' cp -v ~/rpmbuild/RPMS/x86_64/librewolf-*.rpm /artifacts +cp -v ~/rpmbuild/SRPMS/librewolf-*.rpm /artifacts diff --git a/docker/librewolf/fedora/rpm/librewolf.spec b/docker/librewolf/fedora34/rpm/librewolf.spec similarity index 100% rename from docker/librewolf/fedora/rpm/librewolf.spec rename to docker/librewolf/fedora34/rpm/librewolf.spec