added my Recipes
This commit is contained in:
@@ -0,0 +1,172 @@
|
||||
From 888bfe48236b4ce382dc3aa49791cadb70a1fbe4 Mon Sep 17 00:00:00 2001
|
||||
From: Wang Mingyu <wangmy@cn.fujitsu.com>
|
||||
Date: Fri, 25 Dec 2020 14:14:08 +0900
|
||||
Subject: [PATCH] talloc: Add configure options for packages
|
||||
|
||||
Add configure options for the following packages:
|
||||
- acl
|
||||
- attr
|
||||
- libaio
|
||||
- libbsd
|
||||
- libcap
|
||||
- valgrind
|
||||
|
||||
Upstream-Status: Inappropriate [oe deterministic build specific]
|
||||
|
||||
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
||||
|
||||
Modified to apply to version 2.1.10.
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
Modified tp apply to version 2.2.0
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
lib/replace/wscript | 89 +++++++++++++++++++++++++++++++++++----------
|
||||
wscript | 7 +++-
|
||||
2 files changed, 75 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/lib/replace/wscript b/lib/replace/wscript
|
||||
index 827d74f..0348715 100644
|
||||
--- a/lib/replace/wscript
|
||||
+++ b/lib/replace/wscript
|
||||
@@ -25,6 +25,41 @@ def options(opt):
|
||||
opt.PRIVATE_EXTENSION_DEFAULT('')
|
||||
opt.RECURSE('buildtools/wafsamba')
|
||||
|
||||
+ opt.add_option('--with-acl',
|
||||
+ help=("Enable use of acl"),
|
||||
+ action="store_true", dest='enable_acl')
|
||||
+ opt.add_option('--without-acl',
|
||||
+ help=("Disable use of acl"),
|
||||
+ action="store_false", dest='enable_acl', default=False)
|
||||
+
|
||||
+ opt.add_option('--with-attr',
|
||||
+ help=("Enable use of attr"),
|
||||
+ action="store_true", dest='enable_attr')
|
||||
+ opt.add_option('--without-attr',
|
||||
+ help=("Disable use of attr"),
|
||||
+ action="store_false", dest='enable_attr', default=False)
|
||||
+
|
||||
+ opt.add_option('--with-libaio',
|
||||
+ help=("Enable use of libaio"),
|
||||
+ action="store_true", dest='enable_libaio')
|
||||
+ opt.add_option('--without-libaio',
|
||||
+ help=("Disable use of libaio"),
|
||||
+ action="store_false", dest='enable_libaio', default=False)
|
||||
+
|
||||
+ opt.add_option('--with-libbsd',
|
||||
+ help=("Enable use of libbsd"),
|
||||
+ action="store_true", dest='enable_libbsd')
|
||||
+ opt.add_option('--without-libbsd',
|
||||
+ help=("Disable use of libbsd"),
|
||||
+ action="store_false", dest='enable_libbsd', default=False)
|
||||
+
|
||||
+ opt.add_option('--with-libcap',
|
||||
+ help=("Enable use of libcap"),
|
||||
+ action="store_true", dest='enable_libcap')
|
||||
+ opt.add_option('--without-libcap',
|
||||
+ help=("Disable use of libcap"),
|
||||
+ action="store_false", dest='enable_libcap', default=False)
|
||||
+
|
||||
@Utils.run_once
|
||||
def configure(conf):
|
||||
conf.RECURSE('buildtools/wafsamba')
|
||||
@@ -35,12 +70,25 @@ def configure(conf):
|
||||
conf.DEFINE('HAVE_LIBREPLACE', 1)
|
||||
conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1)
|
||||
|
||||
- conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h')
|
||||
- conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h')
|
||||
+ conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h')
|
||||
+ conf.CHECK_HEADERS('attr/xattr.h compat.h ctype.h dustat.h')
|
||||
conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h')
|
||||
conf.CHECK_HEADERS('locale.h ndir.h pwd.h')
|
||||
- conf.CHECK_HEADERS('shadow.h sys/acl.h')
|
||||
- conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h')
|
||||
+ conf.CHECK_HEADERS('shadow.h')
|
||||
+ conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h')
|
||||
+
|
||||
+ if Options.options.enable_acl:
|
||||
+ conf.CHECK_HEADERS('acl/libacl.h sys/acl.h')
|
||||
+
|
||||
+ if Options.options.enable_attr:
|
||||
+ conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h')
|
||||
+
|
||||
+ if Options.options.enable_libaio:
|
||||
+ conf.CHECK_HEADERS('libaio.h')
|
||||
+
|
||||
+ if Options.options.enable_libcap:
|
||||
+ conf.CHECK_HEADERS('sys/capability.h')
|
||||
+
|
||||
conf.CHECK_HEADERS('port.h')
|
||||
conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h')
|
||||
conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h')
|
||||
@@ -110,8 +158,9 @@ def configure(conf):
|
||||
conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
|
||||
conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
|
||||
|
||||
- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h')
|
||||
- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h')
|
||||
+ if Options.options.enable_valgrind:
|
||||
+ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h')
|
||||
+ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h')
|
||||
conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
|
||||
conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
|
||||
conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h')
|
||||
@@ -431,20 +480,20 @@ def configure(conf):
|
||||
|
||||
strlcpy_in_bsd = False
|
||||
|
||||
- # libbsd on some platforms provides strlcpy and strlcat
|
||||
- if not conf.CHECK_FUNCS('strlcpy strlcat'):
|
||||
- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
|
||||
- checklibc=True):
|
||||
- strlcpy_in_bsd = True
|
||||
- if not conf.CHECK_FUNCS('getpeereid'):
|
||||
- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
|
||||
- if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
|
||||
- conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
|
||||
- if not conf.CHECK_FUNCS('setproctitle_init'):
|
||||
- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h')
|
||||
-
|
||||
- if not conf.CHECK_FUNCS('closefrom'):
|
||||
- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
|
||||
+ if Options.options.enable_libbsd:
|
||||
+ # libbsd on some platforms provides strlcpy and strlcat
|
||||
+ if not conf.CHECK_FUNCS('strlcpy strlcat'):
|
||||
+ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
|
||||
+ checklibc=True):
|
||||
+ strlcpy_in_bsd = True
|
||||
+ if not conf.CHECK_FUNCS('getpeereid'):
|
||||
+ conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
|
||||
+ if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
|
||||
+ conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
|
||||
+ if not conf.CHECK_FUNCS('setproctitle_init'):
|
||||
+ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h')
|
||||
+ if not conf.CHECK_FUNCS('closefrom'):
|
||||
+ conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
|
||||
|
||||
conf.CHECK_CODE('''
|
||||
struct ucred cred;
|
||||
diff --git a/wscript b/wscript
|
||||
index 3089663..fdf9510 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -31,7 +31,12 @@ def options(opt):
|
||||
opt.add_option('--enable-talloc-compat1',
|
||||
help=("Build talloc 1.x.x compat library [False]"),
|
||||
action="store_true", dest='TALLOC_COMPAT1', default=False)
|
||||
-
|
||||
+ opt.add_option('--with-valgrind',
|
||||
+ help=("enable use of valgrind"),
|
||||
+ action="store_true", dest='enable_valgrind')
|
||||
+ opt.add_option('--without-valgrind',
|
||||
+ help=("disable use of valgrind"),
|
||||
+ action="store_false", dest='enable_valgrind', default=False)
|
||||
|
||||
def configure(conf):
|
||||
conf.RECURSE('lib/replace')
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
From 6580e8191c219909d50c991662310e668973722d Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Wed, 24 Nov 2021 13:33:35 +0800
|
||||
Subject: [PATCH] Fix pyext_PATTERN for cross compilation
|
||||
|
||||
The pyext_PATTERN will add native arch as suffix when cross compiling.
|
||||
For example, on qemuarm64, it is expanded to:
|
||||
pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so'
|
||||
which will result in the incorrect library name.
|
||||
|
||||
root@qemuarm64:~# find /usr/lib -name \*talloc\*
|
||||
/usr/lib/pkgconfig/talloc.pc
|
||||
/usr/lib/pkgconfig/pytalloc-util.cpython-310-x86_64-linux-gnu.pc
|
||||
/usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2.3.3
|
||||
/usr/lib/libtalloc.so.2
|
||||
/usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2
|
||||
/usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so
|
||||
/usr/lib/libtalloc.so
|
||||
/usr/lib/libtalloc.so.2.3.3
|
||||
/usr/lib/python3.10/site-packages/talloc.cpython-310-x86_64-linux-gnu.so
|
||||
|
||||
Set pyext_PATTERN to '%s.so' to remove the suffix.
|
||||
After the patch:
|
||||
root@qemuarm64:~# find /usr/lib -name \*talloc\*
|
||||
/usr/lib/pkgconfig/talloc.pc
|
||||
/usr/lib/pkgconfig/pytalloc-util.pc
|
||||
/usr/lib/libpytalloc-util.so.2.3.3
|
||||
/usr/lib/libtalloc.so.2
|
||||
/usr/lib/libpytalloc-util.so.2
|
||||
/usr/lib/libpytalloc-util.so
|
||||
/usr/lib/libtalloc.so
|
||||
/usr/lib/libtalloc.so.2.3.3
|
||||
/usr/lib/python3.10/site-packages/talloc.so
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
third_party/waf/waflib/Tools/python.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py
|
||||
index a23bd01..af202e0 100644
|
||||
--- a/third_party/waf/waflib/Tools/python.py
|
||||
+++ b/third_party/waf/waflib/Tools/python.py
|
||||
@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'):
|
||||
x = 'MACOSX_DEPLOYMENT_TARGET'
|
||||
if dct[x]:
|
||||
env[x] = conf.environ[x] = str(dct[x])
|
||||
- env.pyext_PATTERN = '%s' + (dct['EXT_SUFFIX'] or dct['SO']) # SO is deprecated in 3.5 and removed in 3.11
|
||||
+ env.pyext_PATTERN = '%s.so'
|
||||
|
||||
|
||||
# Try to get pythonX.Y-config
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From e18370c204056de799064d8ac72a656eb3745f95 Mon Sep 17 00:00:00 2001
|
||||
From: Wang Mingyu <wangmy@cn.fujitsu.com>
|
||||
Date: Fri, 25 Dec 2020 15:10:58 +0900
|
||||
Subject: [PATCH] avoid attr unless wanted
|
||||
|
||||
---
|
||||
lib/replace/wscript | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/replace/wscript b/lib/replace/wscript
|
||||
index 0348715..a8554d9 100644
|
||||
--- a/lib/replace/wscript
|
||||
+++ b/lib/replace/wscript
|
||||
@@ -967,8 +967,6 @@ def build(bld):
|
||||
if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c'
|
||||
if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c'
|
||||
if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c'
|
||||
- if not bld.CONFIG_SET('HAVE_GETXATTR') or bld.CONFIG_SET('XATTR_ADDITIONAL_OPTIONS'):
|
||||
- REPLACE_SOURCE += ' xattr.c'
|
||||
|
||||
if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
|
||||
REPLACE_SOURCE += ' closefrom.c'
|
||||
@@ -983,7 +981,7 @@ def build(bld):
|
||||
# hide_symbols=bld.BUILTIN_LIBRARY('replace'),
|
||||
private_library=True,
|
||||
provide_builtin_linking=True,
|
||||
- deps='dl attr' + extra_libs)
|
||||
+ deps='dl' + extra_libs)
|
||||
|
||||
replace_test_cflags = ''
|
||||
if bld.CONFIG_SET('HAVE_WNO_FORMAT_TRUNCATION'):
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
SUMMARY = "Hierarchical, reference counted memory pool system with destructors"
|
||||
HOMEPAGE = "https://talloc.samba.org"
|
||||
SECTION = "libs"
|
||||
LICENSE = "LGPL-3.0-or-later & GPL-3.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6d5228bfa7825249 \
|
||||
file://pytalloc.h;beginline=1;endline=18;md5=21ab13bd853679d7d47a1739cb3b7db6 \
|
||||
"
|
||||
|
||||
export PYTHONHASHSEED="1"
|
||||
|
||||
SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \
|
||||
file://0001-talloc-Add-configure-options-for-packages.patch \
|
||||
file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "6df36862c42466ef88f360444513870ef46934f9016c84383cc4008a7d0c46ba"
|
||||
|
||||
inherit waf-samba
|
||||
|
||||
PACKAGECONFIG ??= "\
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \
|
||||
"
|
||||
PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl"
|
||||
PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr"
|
||||
PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio"
|
||||
PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd"
|
||||
PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap"
|
||||
PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind"
|
||||
|
||||
SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}"
|
||||
|
||||
S = "${WORKDIR}/talloc-${PV}"
|
||||
|
||||
#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen
|
||||
#to cross Popen
|
||||
export WAF_NO_PREFORK="yes"
|
||||
|
||||
EXTRA_OECONF += "--disable-rpath \
|
||||
--disable-rpath-install \
|
||||
--bundled-libraries=NONE \
|
||||
--builtin-libraries=replace \
|
||||
--disable-silent-rules \
|
||||
--with-libiconv=${STAGING_DIR_HOST}${prefix}\
|
||||
"
|
||||
|
||||
PACKAGES += "pytalloc pytalloc-dev"
|
||||
|
||||
RPROVIDES:${PN}-dbg += "pytalloc-dbg"
|
||||
|
||||
FILES:pytalloc = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \
|
||||
${libdir}/libpytalloc-util.so.2 \
|
||||
${libdir}/libpytalloc-util.so.2.1.1 \
|
||||
"
|
||||
FILES:pytalloc-dev = "${libdir}/libpytalloc-util.so"
|
||||
RDEPENDS:pytalloc = "python3"
|
||||
Reference in New Issue
Block a user