CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-04 16:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

apt: remove host contamination with gtest

Browse Source 
(From OE-Core rev: 41aa60cdb1e26617e1eeac95a6ffcdd6561c539f)

(From OE-Core rev: a76d66feae7050d5d59964108a065bc6251667eb)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 600cb136cd)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2020-10-28 22:05:55 +01:00 committed by Richard Purdie
parent d59e28ea73
commit f552970178
5 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-devtools/apt/apt/0001-Do-not-configure-packages-on-installation.patch
View File

@ -1,4 +1,4 @@
From 1ad21140787a6b8b0f774f75b50444d2c30a56f6 Mon Sep 17 00:00:00 2001
From 96d23fc57d1ff9c851d563d6d6a6c4752dc4f1b6 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 21 May 2020 20:28:12 +0000
Subject: [PATCH] Do not configure packages on installation

2
meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch
View File

@ -1,4 +1,4 @@
From b18d7aa7d71b53b86bac21cd1d8c3accabb28f2b Mon Sep 17 00:00:00 2001
From bf45c314867e5fb12141803fba06f3e45679d628 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 10 May 2019 16:47:38 +0200
Subject: [PATCH] Do not init tables from dpkg configuration

2
meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
View File

@ -1,4 +1,4 @@
From 742fbb243f99e940c3e6b31296f7f416f550a57a Mon Sep 17 00:00:00 2001
From 34700bebc52659e7e3eecd252f65bd36e669eee8 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 21 May 2020 20:13:25 +0000
Subject: [PATCH] Revert "always run 'dpkg --configure -a' at the end of our

40
meta/recipes-devtools/apt/apt/0001-test-libapt-do-not-use-gtest-from-the-host.patch Normal file
View File

@ -0,0 +1,40 @@
From 28e389a0d1275e7693df84a7d4a58b28364be1a9 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 22 Oct 2020 17:33:38 +0200
Subject: [PATCH] test/libapt: do not use gtest from the host
This really does not work when cross-compiling.
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
test/libapt/CMakeLists.txt | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/test/libapt/CMakeLists.txt b/test/libapt/CMakeLists.txt
index 035ff07..280b83c 100644
--- a/test/libapt/CMakeLists.txt
+++ b/test/libapt/CMakeLists.txt
@@ -6,22 +6,6 @@ find_path(GTEST_ROOT src/gtest.cc
find_package(GTest)
set(GTEST_DEPENDENCIES)
-if(NOT GTEST_FOUND AND EXISTS ${GTEST_ROOT})
- include(ExternalProject)
- ExternalProject_Add(gtest PREFIX ./gtest
- SOURCE_DIR ${GTEST_ROOT}
- INSTALL_COMMAND true)
-
- link_directories(${CMAKE_CURRENT_BINARY_DIR}/gtest/src/gtest-build)
-
- set(GTEST_LIBRARIES "-lgtest")
- set(GTEST_DEPENDENCIES "gtest")
- set(GTEST_FOUND TRUE)
- find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h PATHS ${GTEST_ROOT}/include)
-
- message(STATUS "Found GTest at ${GTEST_ROOT}, headers at ${GTEST_INCLUDE_DIRS}")
-endif()
-
if(GTEST_FOUND)
# gtest produces some warnings with the set of warnings we activate,
# so disable the offending warnings while compiling tests for now

1
meta/recipes-devtools/apt/apt_1.8.2.1.bb
View File

@ -8,6 +8,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \
file://0001-Disable-documentation-directory-altogether.patch \
file://0001-Fix-musl-build.patch \
file://0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch \
file://0001-test-libapt-do-not-use-gtest-from-the-host.patch \
"
SRC_URI_append_class-native = " \