From 42b77651923e31ea6ab891c188adb486535e3007 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 2 Apr 2019 10:49:59 +0800 Subject: samba: move to dynamic layers Leads to errors otherwise when networking layer isn't included. Signed-off-by: Anuj Mittal --- conf/layer.conf | 2 ++ .../samba/files/fix_duplicate_pdb_search_init.patch | 10 ++++++++++ .../recipes-connectivity/samba/samba_4.8.%.bbappend | 3 +++ .../samba/files/fix_duplicate_pdb_search_init.patch | 10 ---------- recipes-connectivity/samba/samba_4.8.%.bbappend | 3 --- 5 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 dynamic-layers/networking-layer/recipes-connectivity/samba/files/fix_duplicate_pdb_search_init.patch create mode 100644 dynamic-layers/networking-layer/recipes-connectivity/samba/samba_4.8.%.bbappend delete mode 100644 recipes-connectivity/samba/files/fix_duplicate_pdb_search_init.patch delete mode 100644 recipes-connectivity/samba/samba_4.8.%.bbappend diff --git a/conf/layer.conf b/conf/layer.conf index addb891..eacedf1 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -12,6 +12,8 @@ LAYERSERIES_COMPAT_clang-layer = "sumo thud warrior" BBFILES_DYNAMIC += " \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ + networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \ + networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \ " PREFERRED_PROVIDER_libgcc-initial = "libgcc-initial" diff --git a/dynamic-layers/networking-layer/recipes-connectivity/samba/files/fix_duplicate_pdb_search_init.patch b/dynamic-layers/networking-layer/recipes-connectivity/samba/files/fix_duplicate_pdb_search_init.patch new file mode 100644 index 0000000..e9d88d2 --- /dev/null +++ b/dynamic-layers/networking-layer/recipes-connectivity/samba/files/fix_duplicate_pdb_search_init.patch @@ -0,0 +1,10 @@ +--- a/source3/wscript_build 2019-03-14 09:03:29.498617250 +0100 ++++ b/source3/wscript_build 2019-03-14 09:06:19.824949694 +0100 +@@ -124,7 +124,6 @@ + '!get_attr_list'] + private_pdb_match.append('!pdb_nds_*') + private_pdb_match.append('!pdb_ldapsam_init*') +-private_pdb_match.append('!pdb_*_init') + private_pdb_match = private_pdb_match + ldapsam_pdb_match + + bld.SAMBA3_LIBRARY('samba-passdb', diff --git a/dynamic-layers/networking-layer/recipes-connectivity/samba/samba_4.8.%.bbappend b/dynamic-layers/networking-layer/recipes-connectivity/samba/samba_4.8.%.bbappend new file mode 100644 index 0000000..dd3c5f9 --- /dev/null +++ b/dynamic-layers/networking-layer/recipes-connectivity/samba/samba_4.8.%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI_append = " file://fix_duplicate_pdb_search_init.patch " diff --git a/recipes-connectivity/samba/files/fix_duplicate_pdb_search_init.patch b/recipes-connectivity/samba/files/fix_duplicate_pdb_search_init.patch deleted file mode 100644 index e9d88d2..0000000 --- a/recipes-connectivity/samba/files/fix_duplicate_pdb_search_init.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/source3/wscript_build 2019-03-14 09:03:29.498617250 +0100 -+++ b/source3/wscript_build 2019-03-14 09:06:19.824949694 +0100 -@@ -124,7 +124,6 @@ - '!get_attr_list'] - private_pdb_match.append('!pdb_nds_*') - private_pdb_match.append('!pdb_ldapsam_init*') --private_pdb_match.append('!pdb_*_init') - private_pdb_match = private_pdb_match + ldapsam_pdb_match - - bld.SAMBA3_LIBRARY('samba-passdb', diff --git a/recipes-connectivity/samba/samba_4.8.%.bbappend b/recipes-connectivity/samba/samba_4.8.%.bbappend deleted file mode 100644 index dd3c5f9..0000000 --- a/recipes-connectivity/samba/samba_4.8.%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI_append = " file://fix_duplicate_pdb_search_init.patch " -- cgit v1.2.3-54-g00ecf