From 1659da8e9279a6e2293a69c69ee26f27f694b089 Mon Sep 17 00:00:00 2001 From: Filip Zyzniewski Date: Sun, 20 Feb 2011 18:27:00 +0000 Subject: [PATCH] package_deb.bbclass/apt: armel architecture name for eabi systems. For dpkg EABI system architecture is called armel, not arm. Reference: http://wiki.debian.org/ArmEabiPort Signed-off-by: Filip Zyzniewski Signed-off-by: Tom Rini --- classes/package_deb.bbclass | 2 ++ recipes/apt/apt_0.7.20.2.bb | 21 ++++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 60e759dd3d..87f31fa912 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -15,6 +15,8 @@ DPKG_ARCH_i486 ?= "i386" DPKG_ARCH_i586 ?= "i386" DPKG_ARCH_i686 ?= "i386" DPKG_ARCH_pentium ?= "i386" +DPKG_ARCH_linux-gnueabi ?= "armel" +DPKG_ARCH_linux-uclibceabi ?= "armel" python package_deb_fn () { bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d) diff --git a/recipes/apt/apt_0.7.20.2.bb b/recipes/apt/apt_0.7.20.2.bb index 5c932a5b31..ca0787cfa1 100644 --- a/recipes/apt/apt_0.7.20.2.bb +++ b/recipes/apt/apt_0.7.20.2.bb @@ -7,21 +7,24 @@ SRC_URI += "file://no-doxygen.patch \ file://no-ko-translation.patch \ file://fix-gcc-4.4-compile.patch \ file://use-host.patch " -PR = "r3" +PR = "r4" require apt-package.inc FILES_${PN} += "${bindir}/apt-key" -do_stage() { - install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/apt-pkg - eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` - oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${STAGING_LIBDIR}/ - ln -sf libapt-pkg$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-pkg.so - oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${STAGING_LIBDIR}/ - ln -sf libapt-inst$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-inst.so +fix_eabi_architecture() { + sed -i \ + 's:^#define COMMON_ARCH "arm"$:#define COMMON_ARCH "armel":' \ + ${S}/include/config.h +} + +do_configure_append_linux-gnueabi() { + fix_eabi_architecture +} - install -m 0644 include/apt-pkg/*.h ${STAGING_INCDIR}/apt-pkg/ +do_configure_append_linux-uclibceabi() { + fix_eabi_architecture } SRC_URI[md5sum] = "e6ee1b594f6ed5fab5cb593ee46cfc21" -- 2.39.5