diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
| commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
| tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/meta/recipes-core/libxcrypt | |
| parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
| download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz | |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-core/libxcrypt')
| -rw-r--r-- | poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.15.bb (renamed from poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.8.bb) | 2 | ||||
| -rw-r--r-- | poky/meta/recipes-core/libxcrypt/libxcrypt.inc (renamed from poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.8.bb) | 6 | ||||
| -rw-r--r-- | poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.15.bb | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.8.bb b/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.15.bb index ebc4648a18..ba74eb1f94 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.8.bb +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.15.bb @@ -2,7 +2,7 @@ # This provides libcrypto.so.1 which contains obsolete APIs, needed for uninative in particular # -require libxcrypt_${PV}.bb +require libxcrypt.inc PROVIDES = "" AUTO_LIBNAME_PKGS = "" diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.8.bb b/poky/meta/recipes-core/libxcrypt/libxcrypt.inc index 1787f6921e..bee1367c99 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.8.bb +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM ?= "file://LICENSING;md5=3bb6614cf5880cbf1b9dbd9e3d145e2c \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "acd84997a5a8b2badd28b70a642abee11272fad2" +SRCREV = "823437d015cd4ab4d100ed205f218681b03ae45c" SRCBRANCH ?= "develop" PROVIDES = "virtual/crypt" @@ -27,7 +27,9 @@ BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir} -Wno-error" CPPFLAGS_append_class-nativesdk = " -Wno-error" +CFLAGS += "-fcommon" + API = "--disable-obsolete-api" EXTRA_OECONF += "${API}" -BBCLASSEXTEND = "nativesdk" +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.15.bb b/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.15.bb new file mode 100644 index 0000000000..79dba2f6dc --- /dev/null +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.15.bb @@ -0,0 +1,2 @@ +require libxcrypt.inc + |