librewolf-bot/bsys5
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

moved some stuff to the assets folder

Browse source
This commit is contained in:
Bert van der Weerd 2022-02-05 23:13:01 +01:00
parent af2b7ec191
commit e448cc331a
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
5 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Makefile
View file

@ -1,4 +1,4 @@
.PHONY : help all clean veryclean fetch prune docker push build docker-debian11 debian11 docker-mint20 mint20 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-fedora34 fedora34 docker-fedora35 fedora35 .PHONY : help all clean veryclean fetch prune docker push build update docker-debian11 debian11 docker-mint20 mint20 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-fedora34 fedora34 docker-fedora35 fedora35
version:=$(shell cat version) version:=$(shell cat version)
release:=$(shell cat release) release:=$(shell cat release)
@ -74,34 +74,39 @@ work : $(tarball)
mkdir work mkdir work
(cd work && tar xf ../$(tarball)) (cd work && tar xf ../$(tarball))
update :
@wget -q -O version "https://gitlab.com/librewolf-community/browser/source/-/raw/main/version"
@wget -q -O source_release "https://gitlab.com/librewolf-community/browser/source/-/raw/main/release"
@echo Source version: $(shell cat version)-$(shell cat source_release)
@echo Bsys5 release: $(shell cat release)
## debian11 ## debian11
docker-debian11 : docker-debian11 :
${MAKE} -f linux.mk distro=debian11 "distro_image=debian:bullseye" docker ${MAKE} -f assets/linux.mk distro=debian11 "distro_image=debian:bullseye" docker
debian11 : work debian11 : work
${MAKE} -f linux.mk distro=debian11 build ${MAKE} -f assets/linux.mk distro=debian11 build
## mint20 ## mint20
docker-mint20 : docker-mint20 :
${MAKE} -f linux.mk distro=mint20 "distro_image=linuxmintd/mint20.2-amd64" docker ${MAKE} -f assets/linux.mk distro=mint20 "distro_image=linuxmintd/mint20.2-amd64" docker
mint20 : work mint20 : work
${MAKE} -f linux.mk distro=mint20 build ${MAKE} -f assets/linux.mk distro=mint20 build
## ubuntu20 ## ubuntu20
docker-ubuntu20 : docker-ubuntu20 :
${MAKE} -f linux.mk distro=ubuntu20 "distro_image=ubuntu:20.04" docker ${MAKE} -f assets/linux.mk distro=ubuntu20 "distro_image=ubuntu:20.04" docker
ubuntu20 : work ubuntu20 : work
${MAKE} -f linux.mk distro=ubuntu20 build ${MAKE} -f assets/linux.mk distro=ubuntu20 build
## ubuntu21 ## ubuntu21
docker-ubuntu21 : docker-ubuntu21 :
${MAKE} -f linux.mk distro=ubuntu21 "distro_image=ubuntu:21.10" docker ${MAKE} -f assets/linux.mk distro=ubuntu21 "distro_image=ubuntu:21.10" docker
ubuntu21 : work ubuntu21 : work
${MAKE} -f linux.mk distro=ubuntu21 build ${MAKE} -f assets/linux.mk distro=ubuntu21 build
## fedora34 ## fedora34
docker-fedora34 : docker-fedora34 :
${MAKE} -f linux.mk distro=fedora34 "distro_image=fedora:34" docker ${MAKE} -f assets/linux.mk distro=fedora34 "distro_image=fedora:34" docker
fedora34 : work fedora34 : work
${MAKE} -f linux.mk distro=fedora34 build ${MAKE} -f assets/linux.mk distro=fedora34 build
## fedora35 ## fedora35
docker-fedora35 : docker-fedora35 :
${MAKE} -f linux.mk distro=fedora35 "distro_image=fedora:35" docker ${MAKE} -f assets/linux.mk distro=fedora35 "distro_image=fedora:35" docker
fedora35 : work fedora35 : work
${MAKE} -f linux.mk distro=fedora35 build ${MAKE} -f assets/linux.mk distro=fedora35 build

0
linux.Dockerfile → assets/linux.Dockerfile
View file

2
linux.mk → assets/linux.mk
View file

@ -13,7 +13,7 @@ use_docker=true
outfile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2 outfile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2
docker : docker :
docker build --build-arg "distro=$(distro_image)" -t librewolf/bsys5-image-$(distro) - < linux.Dockerfile docker build --build-arg "distro=$(distro_image)" -t librewolf/bsys5-image-$(distro) - < assets/linux.Dockerfile
build : work build : work
if [ $(use_docker) = true ]; then \ if [ $(use_docker) = true ]; then \

2
source_release
View file

@ -1 +1 @@
3 4

2
version
View file

@ -1 +1 @@
96.0.3 96.0.3