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

Move libnl to own port

Browse Source 
Issue #4508.
This commit is contained in:
Josef Söntgen 2022-05-17 17:39:54 +02:00 committed by Christian Helmuth
parent 573cabaf24
commit fd14cf9f1e
8 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/dde_linux/lib/import/import-libnl.mk
View File

@ -1,4 +1,4 @@
NL_CONTRIB_INC_DIR := $(call select_from_ports,dde_linux)/src/lib/libnl
NL_CONTRIB_INC_DIR := $(call select_from_ports,libnl)/src/lib/libnl
INC_DIR += $(NL_CONTRIB_INC_DIR)/include
LIBNL_INC_DIR = $(REP_DIR)/src/lib/libnl/include

2
repos/dde_linux/lib/mk/libnl.inc
View File

@ -3,7 +3,7 @@ LIB_INC_DIR = $(LIB_DIR)/include
LIBS += libc libnl_include
LIBNL_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/lib/libnl
LIBNL_CONTRIB_DIR := $(call select_from_ports,libnl)/src/lib/libnl
INC_DIR += $(LIB_INC_DIR)
INC_DIR += $(LIBNL_CONTRIB_DIR)/include

2
repos/dde_linux/lib/mk/libnl_include.mk
View File

@ -1,6 +1,6 @@
ifeq ($(called_from_lib_mk),yes)
LIBNL_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/lib/libnl
LIBNL_CONTRIB_DIR := $(call select_from_ports,libnl)/src/lib/libnl
LIBNL_EMUL_H := $(REP_DIR)/src/lib/libnl/include/libnl_emul.h
#

2
repos/dde_linux/ports/dde_linux.hash
View File

@ -1 +1 @@
428ae50e4ae60462249210de908f941666d7d85f
e65e2ae521cd13ad8471bbd09e72e69af5d13ba3

13
repos/dde_linux/ports/dde_linux.port
View File

@ -1,7 +1,7 @@
LICENSE := GPLv2
VERSION := 2
DOWNLOADS := intel_fb.archive lxip.archive \
fec.archive libnl.archive wpa_supplicant.git \
fec.archive wpa_supplicant.git \
usb_host.archive dwc_otg_host.git usb_hid.archive \
usb_modem.archive usb_net.archive
@ -97,13 +97,6 @@ DIR(fec) := $(SRC_DIR_FEC)
TAR_OPT(fec) := --strip-components=1 --files-from - < <(sed 's/-x.x.x/-$(VERSION_FEC)/g' $(REP_DIR)/fec.list)
HASH_INPUT += $(REP_DIR)/fec.list
#
# libnl sources
#
URL(libnl) := https://github.com/thom311/libnl/releases/download/libnl3_2_25/libnl-3.2.25.tar.gz
SHA(libnl) := 8beb7590674957b931de6b7f81c530b85dc7c1ad8fbda015398bc1e8d1ce8ec5
DIR(libnl) := src/lib/libnl
#
# wpa_supplicant sources
#
@ -115,7 +108,6 @@ DIR(wpa_supplicant) := src/app/wpa_supplicant
# Patches
#
PATCHES := $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/wpa*.patch)))
PATCHES += $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/libnl*.patch)))
PATCHES += $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/lxip*.patch)))
PATCHES += $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/intel*.patch)))
PATCHES += $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/usb_host*.patch)))
@ -135,9 +127,6 @@ PATCH_OPT(patches/lxip_request_sock.patch) := $(LXIP_OPT)
PATCH_OPT(patches/lxip_sk_wq.patch) := $(LXIP_OPT)
PATCH_OPT(patches/lxip_skbuff_cast.patch) := $(LXIP_OPT)
# libnl
PATCH_OPT(patches/libnl.patch) := -p1 -d ${DIR(libnl)}
# WPA supplicant
PATCH_OPT(patches/wpa_supplicant.patch) := -p1 -d ${DIR(wpa_supplicant)}

1
repos/dde_linux/ports/libnl.hash Normal file
View File

@ -0,0 +1 @@
129b0b7ddc24ad7e6bfb6d885f99b480c63e7832

21
repos/dde_linux/ports/libnl.port Normal file
View File

@ -0,0 +1,21 @@
LICENSE := LGPL-2.1-only
VERSION := 3.2.25
DOWNLOADS := libnl.archive
#
# libnl sources
#
BASE_URL := https://github.com/thom311/libnl/releases/download
URL(libnl) := $(BASE_URL)/libnl$(subst .,_,$(VERSION))/libnl-$(VERSION).tar.gz
SHA(libnl) := 8beb7590674957b931de6b7f81c530b85dc7c1ad8fbda015398bc1e8d1ce8ec5
DIR(libnl) := src/lib/libnl
#
# Patches
#
PATCHES += $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/libnl*.patch)))
# libnl
PATCH_OPT(patches/libnl.patch) := -p1 -d ${DIR(libnl)}
# vi: set ft=make :

12
repos/pc/recipes/src/pc_wifi_drv/content.mk
View File

@ -22,6 +22,8 @@ MIRROR_FROM_OS_DIR := src/lib/genode_c_api/uplink.cc
DDE_LINUX_REP_DIR := $(GENODE_DIR)/repos/dde_linux
DDE_LINUX_PORT_DIR := $(call port_dir,$(DDE_LINUX_REP_DIR)/ports/dde_linux)
LIBNL_PORT_DIR := $(call port_dir,$(DDE_LINUX_REP_DIR)/ports/libnl)
DDE_LINUX_LIB_MK := \
$(addprefix lib/mk/,libnl.inc libnl_include.mk) \
$(foreach SPEC,x86_32 x86_64,lib/mk/spec/$(SPEC)/libnl.mk) \
@ -35,11 +37,11 @@ MIRROR_FROM_DDE_LINUX_DIR := $(DDE_LINUX_LIB_MK) \
$(shell cd $(DDE_LINUX_REP_DIR); find src/lib/wpa_driver_nl80211 -type f) \
$(shell cd $(DDE_LINUX_REP_DIR); find src/lib/wpa_supplicant -type f)
MIRROR_FROM_DDE_LINUX_PORT_DIR := $(shell cd $(DDE_LINUX_PORT_DIR); find src/lib/libnl -type f) \
$(shell cd $(DDE_LINUX_PORT_DIR); find src/app/wpa_supplicant -type f)
MIRROR_FROM_DDE_LINUX_PORT_DIR := $(shell cd $(DDE_LINUX_PORT_DIR); find src/app/wpa_supplicant -type f)
MIRROR_FROM_LIBNL_PORT_DIR := $(shell cd $(LIBNL_PORT_DIR); find src/lib/libnl -type f)
content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_OS_DIR) $(MIRROR_FROM_DDE_LINUX_DIR) \
$(MIRROR_FROM_DDE_LINUX_PORT_DIR) cleanup-wpa
$(MIRROR_FROM_DDE_LINUX_PORT_DIR) $(MIRROR_FROM_LIBNL_PORT_DIR) cleanup-wpa
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)
@ -56,6 +58,10 @@ $(MIRROR_FROM_DDE_LINUX_PORT_DIR):
mkdir -p $(dir $@)
cp -r $(DDE_LINUX_PORT_DIR)/$@ $@
$(MIRROR_FROM_LIBNL_PORT_DIR):
mkdir -p $(dir $@)
cp -r $(LIBNL_PORT_DIR)/$@ $@
cleanup-wpa: $(MIRROR_FROM_DDE_LINUX_PORT_DIR)
@for dir in .git doc eap_example hs20 mac80211_hwsim radius_example \
hostapd tests wlantest wpadebug wpaspy; do \