summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-05-29 13:31:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-05-29 13:32:55 +0100
commit7412af2d39673ba34880e96fd54a2ed39aa82c14 (patch)
tree7976684f7a6129e93b06ebf4949c6eb79afd3ae9 /meta
parent6ebe71a52eae6b539560aa6a1ea12964dd10ed1e (diff)
downloadpoky-7412af2d39673ba34880e96fd54a2ed39aa82c14.tar.gz
Revert "python3/ruby/shadow: Revert add libxcrypt-native dependency"
This reverts commit c6198e1b1c3e3a3413b6ff9f014b40114f1850db. This reverts commit 167c2c9f15c1bfe401c0512e420a76fa1379c012. This reverts commit 65532fc751dc00e5568e256166f7b259d3a3c06c. The dependencies should not be a -native in the target case. Revert these whilst the proper patch is worked out. (From OE-Core rev: 54eccb76eb8ba2086a56a30dfbb8aba06b02865a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/python/python3_3.11.2.bb2
-rw-r--r--meta/recipes-devtools/ruby/ruby_3.2.2.bb2
-rw-r--r--meta/recipes-extended/shadow/shadow.inc2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/python/python3_3.11.2.bb b/meta/recipes-devtools/python/python3_3.11.2.bb
index 1ca4ad35be..421a305e22 100644
--- a/meta/recipes-devtools/python/python3_3.11.2.bb
+++ b/meta/recipes-devtools/python/python3_3.11.2.bb
@@ -72,7 +72,7 @@ ALTERNATIVE_LINK_NAME[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config
72ALTERNATIVE_TARGET[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config-${MULTILIB_SUFFIX}" 72ALTERNATIVE_TARGET[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config-${MULTILIB_SUFFIX}"
73 73
74 74
75DEPENDS = "bzip2-replacement-native expat libffi bzip2 openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux-libuuid libtirpc libnsl2 autoconf-archive-native ncurses libxcrypt-native" 75DEPENDS = "bzip2-replacement-native expat libffi bzip2 openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux-libuuid libtirpc libnsl2 autoconf-archive-native ncurses"
76DEPENDS:append:class-target = " python3-native" 76DEPENDS:append:class-target = " python3-native"
77DEPENDS:append:class-nativesdk = " python3-native" 77DEPENDS:append:class-nativesdk = " python3-native"
78 78
diff --git a/meta/recipes-devtools/ruby/ruby_3.2.2.bb b/meta/recipes-devtools/ruby/ruby_3.2.2.bb
index d1900bfa4b..481fe7c23d 100644
--- a/meta/recipes-devtools/ruby/ruby_3.2.2.bb
+++ b/meta/recipes-devtools/ruby/ruby_3.2.2.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \
13 file://LEGAL;md5=bcd74b47bbaf2051c5e49811a5faa97a \ 13 file://LEGAL;md5=bcd74b47bbaf2051c5e49811a5faa97a \
14 " 14 "
15 15
16DEPENDS = "zlib openssl libyaml gdbm readline libffi libxcrypt-native" 16DEPENDS = "zlib openssl libyaml gdbm readline libffi"
17DEPENDS:append:class-target = " ruby-native" 17DEPENDS:append:class-target = " ruby-native"
18DEPENDS:append:class-nativesdk = " ruby-native" 18DEPENDS:append:class-nativesdk = " ruby-native"
19 19
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc
index 7206bfdf02..cf05a3af93 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c9a450b7be84eac23e6353efecb60b5b \
8 file://src/passwd.c;beginline=2;endline=30;md5=758c26751513b6795395275969dd3be1 \ 8 file://src/passwd.c;beginline=2;endline=30;md5=758c26751513b6795395275969dd3be1 \
9 " 9 "
10 10
11DEPENDS = "virtual/crypt libxcrypt-native" 11DEPENDS = "virtual/crypt"
12 12
13GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases" 13GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases"
14SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ 14SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \