Patchwork [PATCHv2] package_deb.bbclass/apt: armel architecture name for eabi systems.

login
register
mail settings
Submitter Filip Zyzniewski
Date Feb. 19, 2011, 11:30 p.m.
Message ID <1298158249-10217-1-git-send-email-filip.zyzniewski@gmail.com>
Download mbox | patch
Permalink /patch/725/
State Superseded
Headers show

Comments

Filip Zyzniewski - Feb. 19, 2011, 11:30 p.m.
For dpkg EABI system architecture is called armel, not arm.
Reference: http://wiki.debian.org/ArmEabiPort

Signed-off-by: Filip Zyzniewski <filip.zyzniewski@gmail.com>
---
 classes/package_deb.bbclass |    2 ++
 recipes/apt/apt_0.7.20.2.bb |   13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletions(-)
Khem Raj - Feb. 20, 2011, 1:11 a.m.
On (20/02/11 00:30), Filip Zyzniewski wrote:
> For dpkg EABI system architecture is called armel, not arm.
> Reference: http://wiki.debian.org/ArmEabiPort
> 
> Signed-off-by: Filip Zyzniewski <filip.zyzniewski@gmail.com>
> ---
>  classes/package_deb.bbclass |    2 ++
>  recipes/apt/apt_0.7.20.2.bb |   13 ++++++++++++-
>  2 files changed, 14 insertions(+), 1 deletions(-)
> 
> diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass
> index 60e759d..87f31fa 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"

this seems ok 

>  
>  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 5c932a5..c8a3516 100644
> --- a/recipes/apt/apt_0.7.20.2.bb
> +++ b/recipes/apt/apt_0.7.20.2.bb
> @@ -7,12 +7,23 @@ 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_configure_append_linux-gnueabi() {
> +	sed -i \
> +	's:^#define COMMON_ARCH "arm"$:#define COMMON_ARCH "armel":' \
> +		${S}/include/config.h
> +}
> +
> +do_configure_append_linux-uclibceabi() {
> +	do_configure_append_linux-gnueabi()
> +}
> +
> +

did you test the above calls ? I think these append should be defined
individually i.e. duplicate them

>  do_stage() {
>  	install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/apt-pkg
>  	eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'`

while at it please get rid of do_stage
> -- 
> 1.7.1
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Filip Zyzniewski - Feb. 20, 2011, 10:23 a.m.
On 2/20/11, Khem Raj <raj.khem@gmail.com> wrote:

> did you test the above calls ? I think these append should be defined
> individually i.e. duplicate them

I've changed it to be symmetrical (both call a separate function) so
that I can verify it on my build and avoid duplication of code.

> while at it please get rid of do_stage

I've removed it and resulting package has the same contents, so removed it is.

I have just realised that I've skipped increasing PR, I'll send a
fixed one in a minute.

bye,
Filip Zyzniewski

Patch

diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass
index 60e759d..87f31fa 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 5c932a5..c8a3516 100644
--- a/recipes/apt/apt_0.7.20.2.bb
+++ b/recipes/apt/apt_0.7.20.2.bb
@@ -7,12 +7,23 @@  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_configure_append_linux-gnueabi() {
+	sed -i \
+	's:^#define COMMON_ARCH "arm"$:#define COMMON_ARCH "armel":' \
+		${S}/include/config.h
+}
+
+do_configure_append_linux-uclibceabi() {
+	do_configure_append_linux-gnueabi()
+}
+
+
 do_stage() {
 	install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/apt-pkg
 	eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'`