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

Fri 28 Oct 2022 10:00:08 PM CEST

Browse source
This commit is contained in:
Bert van der Weerd 2022-10-28 22:00:08 +02:00
parent 97f4669180
commit ea5f0e7c18
No known key found for this signature in database
GPG key ID: 73370A0B9E5516B0
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lw-linux-base/Makefile
View file

@ -6,6 +6,7 @@ source_release:=$(shell cat source_release)
full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)") full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)")
mozbuild=~/.mozbuild mozbuild=~/.mozbuild
assets=assets/linux-base
ifeq ($(target_type),) ifeq ($(target_type),)
target_type:=flatpak target_type:=flatpak
endif endif
@ -77,8 +78,8 @@ veryclean : clean
# this is the place to apply patches and create a custom mozconfig # this is the place to apply patches and create a custom mozconfig
pre-build : pre-build :
cp -v assets/mozconfig.$(arch) librewolf-$(full_version)/mozconfig cp -v $(assets)/mozconfig.$(arch) librewolf-$(full_version)/mozconfig
./assets/pre_build_patches_mozconfig.sh ./$(assets)/pre_build_patches_mozconfig.sh
build : dir build : dir
(cd librewolf-$(full_version) && ./mach build) (cd librewolf-$(full_version) && ./mach build)
@ -91,7 +92,7 @@ package : dir
post-package : post-package :
cp -v librewolf-$(full_version)/obj-$(arch)-pc-linux-gnu/dist/librewolf-$(full_version).en-US.linux-$(arch).tar.bz2 . cp -v librewolf-$(full_version)/obj-$(arch)-pc-linux-gnu/dist/librewolf-$(full_version).en-US.linux-$(arch).tar.bz2 .
./assets/post_package_distini_etc.sh ./$(assets)/post_package_distini_etc.sh
artifacts : artifacts :
${MAKE} -f assets/$(target_type)/artifacts.mk artifacts ${MAKE} -f assets/$(target_type)/artifacts.mk artifacts

8
lw-linux-base/assets/pre_build_patches_mozconfig.sh
View file

@ -31,12 +31,12 @@ fi
cd librewolf-$full_version cd librewolf-$full_version
# hopefully the magic sauce that makes things build on 18.04 and later on work "everywhere" # hopefully the magic sauce that makes things build on 18.04 and later on work "everywhere"
patch -Np1 -i ../assets/deb_patches/armhf-reduce-linker-memory-use.patch patch -Np1 -i ../assets/linux-base//deb_patches/armhf-reduce-linker-memory-use.patch
patch -Np1 -i ../assets/deb_patches/reduce-rust-debuginfo.patch patch -Np1 -i ../assets/linux-base//deb_patches/reduce-rust-debuginfo.patch
patch -Np1 -i ../assets/deb_patches/use-system-icupkg.patch patch -Np1 -i ../assets/linux-base//deb_patches/use-system-icupkg.patch
# might make the build just a tiny bit cleaner, not really required though # might make the build just a tiny bit cleaner, not really required though
patch -Np1 -i ../assets/deb_patches/fix-wayland-build.patch patch -Np1 -i ../assets/linux-base//deb_patches/fix-wayland-build.patch
cd .. cd ..