android-tools: remove two Debianisms

If the build happens on a Debian system, android-tools build will hang
forever, filling the log files (and the disk) with the following
messages:

make: dpkg-architecture: No such file or directory
make: dpkg-architecture: No such file or directory
make: dpkg-architecture: No such file or directory
make: dpkg-architecture: No such file or directory
/usr/share/dpkg/architecture.mk:9: pipe: Too many open files
/usr/share/dpkg/architecture.mk:9: pipe: Too many open files
/usr/share/dpkg/architecture.mk:9: pipe: Too many open files
/usr/share/dpkg/architecture.mk:9: pipe: Too many open files
/usr/share/dpkg/architecture.mk:9: pipe: Too many open files

Fix two places which include dpkg makefile fragments from the host
system.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Dmitry Baryshkov 2023-12-12 16:02:40 +02:00 committed by Khem Raj
parent 23b62b3391
commit 90976455c1
No known key found for this signature in database
GPG Key ID: BB053355919D3314

View File

@ -88,11 +88,12 @@ diff --git a/debian/system/core/libbacktrace.mk b/debian/system/core/libbacktrac
index e3411d76..86e69874 100644
--- a/debian/system/core/libbacktrace.mk
+++ b/debian/system/core/libbacktrace.mk
@@ -1,3 +1,4 @@
@@ -1,4 +1,4 @@
-include /usr/share/dpkg/architecture.mk
+include rules_yocto.mk
include /usr/share/dpkg/architecture.mk
NAME = libbacktrace
@@ -83,10 +84,9 @@ CPPFLAGS += \
LDFLAGS += \
-L/usr/lib/p7zip \
@ -218,6 +219,12 @@ diff --git a/debian/system/core/libutils.mk b/debian/system/core/libutils.mk
index c37b1d2d..332492c1 100644
--- a/debian/system/core/libutils.mk
+++ b/debian/system/core/libutils.mk
@@ -1,4 +1,4 @@
-include /usr/share/dpkg/architecture.mk
+include rules_yocto.mk
NAME = libutils
@@ -41,7 +41,7 @@ CPPFLAGS += \
LDFLAGS += \