diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2023-10-12 19:56:12 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-10-12 08:06:57 -0700 |
| commit | 649f63a235a968749ba833476f9acaa7af2e2130 (patch) | |
| tree | 828c2ee393a9c1d19c489059f3a8940f2bfbabdb /meta-networking/recipes-connectivity/samba/samba_4.18.8.bb | |
| parent | f674a9d4f9feb3afecdc81f4bced5469edc3bc71 (diff) | |
| download | meta-openembedded-649f63a235a968749ba833476f9acaa7af2e2130.tar.gz | |
samba: use external cmocka instead of bundled cmocka
Do not use bundled cmocka to get rid of bundled library
libcmocka-samba4.so.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/samba/samba_4.18.8.bb')
| -rw-r--r-- | meta-networking/recipes-connectivity/samba/samba_4.18.8.bb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.18.8.bb b/meta-networking/recipes-connectivity/samba/samba_4.18.8.bb index 1ded9fe5ee..dc9bc1a7f9 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.18.8.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.18.8.bb | |||
| @@ -29,7 +29,6 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ | |||
| 29 | SRC_URI:append:libc-musl = " \ | 29 | SRC_URI:append:libc-musl = " \ |
| 30 | file://samba-pam.patch \ | 30 | file://samba-pam.patch \ |
| 31 | file://samba-4.3.9-remove-getpwent_r.patch \ | 31 | file://samba-4.3.9-remove-getpwent_r.patch \ |
| 32 | file://cmocka-uintptr_t.patch \ | ||
| 33 | " | 32 | " |
| 34 | 33 | ||
| 35 | SRC_URI[sha256sum] = "4fb87bceaeb01d832a59046c197a044b7e8e8000581548b5d577a6cda03344d1" | 34 | SRC_URI[sha256sum] = "4fb87bceaeb01d832a59046c197a044b7e8e8000581548b5d577a6cda03344d1" |
| @@ -43,7 +42,7 @@ CVE_STATUS[CVE-2011-2411] = "not-applicable-platform: vulnerable only on HP NonS | |||
| 43 | # remove default added RDEPENDS on perl | 42 | # remove default added RDEPENDS on perl |
| 44 | RDEPENDS:${PN}:remove = "perl" | 43 | RDEPENDS:${PN}:remove = "perl" |
| 45 | 44 | ||
| 46 | DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 jansson libparse-yapp-perl-native gnutls" | 45 | DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 libtasn1-native jansson libparse-yapp-perl-native gnutls cmocka" |
| 47 | 46 | ||
| 48 | inherit features_check | 47 | inherit features_check |
| 49 | REQUIRED_DISTRO_FEATURES = "pam" | 48 | REQUIRED_DISTRO_FEATURES = "pam" |
| @@ -105,7 +104,7 @@ SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODU | |||
| 105 | # .so files so there will not be a conflict. This is not done consistantly, so be very careful | 104 | # .so files so there will not be a conflict. This is not done consistantly, so be very careful |
| 106 | # when adding to this list. | 105 | # when adding to this list. |
| 107 | # | 106 | # |
| 108 | SAMBA4_LIBS="heimdal,cmocka,NONE" | 107 | SAMBA4_LIBS="heimdal,NONE" |
| 109 | 108 | ||
| 110 | EXTRA_OECONF += "--enable-fhs \ | 109 | EXTRA_OECONF += "--enable-fhs \ |
| 111 | --with-piddir=/run \ | 110 | --with-piddir=/run \ |
