ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-19 21:17:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Cairo/FBWhiptail to the build process

Browse Source 
Enable it by default for the Librem 13 v2
This commit is contained in:
Youness Alaoui 2018-03-06 14:57:00 -05:00
parent e62362ddcc
commit 8ca6286ae0
No known key found for this signature in database
GPG Key ID: AAFC4B34BBEBB31C
6 changed files with 101 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -347,6 +347,8 @@ bin_modules-$(CONFIG_LVM2) += lvm2
bin_modules-$(CONFIG_DROPBEAR) += dropbear
bin_modules-$(CONFIG_FLASHTOOLS) += flashtools
bin_modules-$(CONFIG_NEWT) += newt
bin_modules-$(CONFIG_CAIRO) += cairo
bin_modules-$(CONFIG_FBWHIPTAIL) += fbwhiptail
$(foreach m, $(bin_modules-y), \
$(call map,initrd_bin_add,$(call bins,$m)) \
@ -487,6 +489,10 @@ module_dirs := \
$(kernel-headers_dir) \
$(slang_dir) \
$(newt_dir) \
$(libpng_dir) \
$(pixman_dir) \
$(cairo_dir) \
$(fbwhiptail_dir)
modules.clean:
for dir in $(module_dirs) \

7
boards/librem13v2/librem13v2.config
View File

@ -10,13 +10,16 @@ CONFIG_KEXEC=y
CONFIG_UTIL_LINUX=y
CONFIG_LVM2=y
CONFIG_MBEDTLS=y
CONFIG_NEWT=y
CONFIG_PCIUTILS=y
CONFIG_POPT=y
CONFIG_QRENCODE=y
CONFIG_SLANG=y
CONFIG_TPMTOTP=y
#CONFIG_SLANG=y
#CONFIG_NEWT=y
CONFIG_CAIRO=y
CONFIG_FBWHIPTAIL=y
CONFIG_LINUX_USB=y
export CONFIG_TPM=y

28
modules/cairo Normal file
View File

@ -0,0 +1,28 @@
modules-$(CONFIG_CAIRO) += cairo
cairo_version := 1.14.12
cairo_dir := cairo-$(cairo_version)
cairo_tar := cairo-$(cairo_version).tar.xz
cairo_url := https://www.cairographics.org/releases/$(cairo_tar)
cairo_hash := 8c90f00c500b2299c0a323dd9beead2a00353752b2092ead558139bd67f7bf16
cairo_configure := \
$(CROSS_TOOLS) \
CFLAGS="-DCAIRO_NO_MUTEX=1 -O3" \
./configure \
--host i386-elf-linux \
--prefix="/" \
--disable-xlib --disable-xcb --disable-pdf \
--disable-ps --disable-svg --disable-script \
--disable-ft --disable-fc --disable-pthread \
--disable-glib --disable-gobject
cairo_target := \
$(MAKE_JOBS) \
$(CROSS_TOOLS) \
DESTDIR="$(INSTALL)" \
install
cairo_libraries := src/.libs/libcairo.so.2
cairo_depends := pixman $(musl_dep)

15
modules/fbwhiptail Normal file
View File

@ -0,0 +1,15 @@
modules-$(CONFIG_FBWHIPTAIL) += fbwhiptail
fbwhiptail_depends := cairo $(musl_dep)
fbwhiptail_version := git
fbwhiptail_dir := fbwhiptail
fbwhiptail_repo := https://code.puri.sm/kakaroto/fbwhiptail.git
fbwhiptail_target := \
$(MAKE_JOBS) \
$(CROSS_TOOLS) \
fbwhiptail
fbwhiptail_output := \
fbwhiptail whiptail

23
modules/libpng Normal file
View File

@ -0,0 +1,23 @@
modules-$(CONFIG_CAIRO) += libpng
libpng_version := 1.6.34
libpng_dir := libpng-$(libpng_version)
libpng_tar := libpng-$(libpng_version).tar.gz
libpng_url := https://download.sourceforge.net/libpng/$(libpng_tar)
libpng_hash := 574623a4901a9969080ab4a2df9437026c8a87150dfd5c235e28c94b212964a7
libpng_configure := \
$(CROSS_TOOLS) \
./configure \
--host i386-elf-linux \
--prefix="/" \
libpng_target := \
$(MAKE_JOBS) \
$(CROSS_TOOLS) \
DESTDIR="$(INSTALL)" \
install \
libpng_libraries := .libs/libpng16.so.16
libpng_depends := zlib $(musl_dep)

24
modules/pixman Normal file
View File

@ -0,0 +1,24 @@
modules-$(CONFIG_CAIRO) += pixman
pixman_version := 0.34.0
pixman_dir := pixman-$(pixman_version)
pixman_tar := pixman-$(pixman_version).tar.gz
pixman_url := https://www.cairographics.org/releases/$(pixman_tar)
pixman_hash := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e
pixman_configure := \
$(CROSS_TOOLS) \
./configure \
--host i386-elf-linux \
--prefix="/" \
--disable-gtk
pixman_target := \
$(MAKE_JOBS) \
$(CROSS_TOOLS) \
DESTDIR="$(INSTALL)" \
install \
pixman_libraries := pixman/.libs/libpixman-1.so.0
pixman_depends := libpng $(musl_dep)