Openembedded Devel Discussions
 help / color / mirror / Atom feed
* [meta-oe][resend][PATCH 1/2] Revert "libxml++: only include when x11 in DISTRO_FEATURES"
@ 2018-05-30 11:31 Martin Jansa
  2018-05-30 11:31 ` [meta-oe][resend][PATCH 2/2] android-tools: use fixed SRCREVs instead of tag name Martin Jansa
  0 siblings, 1 reply; 2+ messages in thread
From: Martin Jansa @ 2018-05-30 11:31 UTC (permalink / raw)
  To: openembedded-devel

This reverts commit 44ece3daea4028e72473b6316ba3c7c54d833166.
---
 meta-oe/recipes-core/libxml/libxml++_2.40.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb b/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb
index a38315c4d5..c001c184cb 100644
--- a/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb
+++ b/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f3
 
 DEPENDS = "libxml2 glibmm"
 
-inherit distro_features_check autotools pkgconfig ptest
+inherit autotools pkgconfig ptest
 
 do_compile_ptest() {
   oe_runmake -C examples buildtest
-- 
2.17.0



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [meta-oe][resend][PATCH 2/2] android-tools: use fixed SRCREVs instead of tag name
  2018-05-30 11:31 [meta-oe][resend][PATCH 1/2] Revert "libxml++: only include when x11 in DISTRO_FEATURES" Martin Jansa
@ 2018-05-30 11:31 ` Martin Jansa
  0 siblings, 0 replies; 2+ messages in thread
From: Martin Jansa @ 2018-05-30 11:31 UTC (permalink / raw)
  To: openembedded-devel

* so that bitbake doesn't need to use git ls-remote during parsing to resolve tag name into SRCREV

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../android-tools/android-tools_5.1.1.r37.bb   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index 5d8f8a8435..780ecaa11a 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = " \
 "
 DEPENDS = "libbsd libpcre openssl zlib libcap"
 
-ANDROID_TAG = "android-5.1.1_r37"
 ANDROID_MIRROR = "android.googlesource.com"
 CORE_REPO = "${ANDROID_MIRROR}/platform/system/core"
 EXTRAS_REPO = "${ANDROID_MIRROR}/platform/system/extras"
@@ -17,12 +16,19 @@ LIBHARDWARE_REPO = "${ANDROID_MIRROR}/platform/hardware/libhardware"
 LIBSELINUX_REPO = "${ANDROID_MIRROR}/platform/external/libselinux"
 BUILD_REPO = "${ANDROID_MIRROR}/platform/build"
 
+# matches with android-5.1.1_r37
+SRCREV_core = "2314b110bdebdbfd2d94c502282f9e57c849897e"
+SRCREV_extras = "3ecbe8d841df96127d7855661293e5ab6ba6c205"
+SRCREV_libhardware = "be55eb1f4d840c82ffaf7c47460df17ff5bc4d9b"
+SRCREV_libselinux = "07e9e1339ad1ba608acfba9dce2d0f474b252feb"
+SRCREV_build = "16e987def3d7d8f7d30805eb95cef69e52a87dbc"
+
 SRC_URI = " \
-    git://${CORE_REPO};name=core;protocol=https;nobranch=1;destsuffix=git/system/core;tag=${ANDROID_TAG} \
-    git://${EXTRAS_REPO};name=extras;protocol=https;nobranch=1;destsuffix=git/system/extras;tag=${ANDROID_TAG} \
-    git://${LIBHARDWARE_REPO};name=libhardware;protocol=https;nobranch=1;destsuffix=git/hardware/libhardware;tag=${ANDROID_TAG} \
-    git://${LIBSELINUX_REPO};name=libselinux;protocol=https;nobranch=1;destsuffix=git/external/libselinux;tag=${ANDROID_TAG} \
-    git://${BUILD_REPO};name=build;protocol=https;nobranch=1;destsuffix=git/build;tag=${ANDROID_TAG} \
+    git://${CORE_REPO};name=core;protocol=https;nobranch=1;destsuffix=git/system/core \
+    git://${EXTRAS_REPO};name=extras;protocol=https;nobranch=1;destsuffix=git/system/extras \
+    git://${LIBHARDWARE_REPO};name=libhardware;protocol=https;nobranch=1;destsuffix=git/hardware/libhardware \
+    git://${LIBSELINUX_REPO};name=libselinux;protocol=https;nobranch=1;destsuffix=git/external/libselinux \
+    git://${BUILD_REPO};name=build;protocol=https;nobranch=1;destsuffix=git/build \
     file://remove-selinux-android.patch \
     file://use-capability.patch \
     file://use-local-socket.patch \
-- 
2.17.0



^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-05-30 11:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-30 11:31 [meta-oe][resend][PATCH 1/2] Revert "libxml++: only include when x11 in DISTRO_FEATURES" Martin Jansa
2018-05-30 11:31 ` [meta-oe][resend][PATCH 2/2] android-tools: use fixed SRCREVs instead of tag name Martin Jansa

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox