Misc fixes

When using update-alternatives, there should be a runtime dependency on update-alternatives. Without this, it's possible to get into a situation where the package is not installable.

Signed-off-by Mark Hatle <[email protected]>

---
 meta/classes/update-alternatives.bbclass |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

meta/classes/update-alternatives.bbclass +0 -0

index 4e1ff27..e432506 100644

meta/classes/update-alternatives.bbclass +0 -0

             bb.note('adding update-alternatives calls to postinst/postrm for %s' % pkg)
             bb.note('%s' % alt_setup_links)
             postinst = (d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True)) or '#!/bin/sh\n'

Signature · 7 lines

1.7.3.4


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Quoted 16 lines · Mark Hatle

When using update-alternatives, there should be a runtime dependency on update-alternatives. Without this, it's possible to get into a situation where the package is not installable.

Signed-off-by Mark Hatle <[email protected]>

---
  meta/classes/update-alternatives.bbclass |    6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)

meta/classes/update-alternatives.bbclass +0 -0

index 4e1ff27..e432506 100644
@@ -304,6 +304,12 @@ python populate_packages_prepend () {
              alt_remove_links += '\tupdate-alternatives --remove  %s %s\n' % (alt_name, alt_target)
 

meta/classes/update-alternatives.bbclass python populate_packages_prepend () { · line 312

Quoted 7 lines

meta/classes/update-alternatives.bbclass +6 -0

          if alt_setup_links:
+            # RDEPENDS setup
+            bb.note('adding runtime requirement for update-alternatives for %s' % pkg)
+            rdepends = d.getVar('RDEPENDS_%s' % pkg, True) or ""
+            rdepends += ' ' + d.getVar('MLPREFIX') + 'update-alternatives'
+            d.setVar("RDEPENDS_%s" % pkg, rdepends)
+

I guess you should use VIRTUAL-RUNTIME_update-alternatives here

Cheers,

Quoted 11 lines

meta/classes/update-alternatives.bbclass +0 -1

              bb.note('adding update-alternatives calls to postinst/postrm for %s' % pkg)
              bb.note('%s' % alt_setup_links)
              postinst = (d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True)) or '#!/bin/sh\n'
--

1.7.3.4

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Quoted 17 lines · Martin Jansa

Quoted 16 lines · Mark Hatle

When using update-alternatives, there should be a runtime dependency on update-alternatives. Without this, it's possible to get into a situation where the package is not installable.

Signed-off-by Mark Hatle <[email protected]>

---
  meta/classes/update-alternatives.bbclass |    6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)

meta/classes/update-alternatives.bbclass +0 -0

index 4e1ff27..e432506 100644
@@ -304,6 +304,12 @@ python populate_packages_prepend () {
              alt_remove_links += '\tupdate-alternatives --remove  %s %s\n' % (alt_name, alt_target)
 

Quoted 9 lines

meta/classes/update-alternatives.bbclass python populate_packages_prepend () { · line 312

Quoted 7 lines

meta/classes/update-alternatives.bbclass +6 -0

          if alt_setup_links:
+            # RDEPENDS setup
+            bb.note('adding runtime requirement for update-alternatives for %s' % pkg)
+            rdepends = d.getVar('RDEPENDS_%s' % pkg, True) or ""
+            rdepends += ' ' + d.getVar('MLPREFIX') + 'update-alternatives'
+            d.setVar("RDEPENDS_%s" % pkg, rdepends)
+

I guess you should use VIRTUAL-RUNTIME_update-alternatives here

I believe what I have here is correct.

We don't care which update-alternatives
we use, just that one is used.

recipes-devtools/dpkg/dpkg.inc:RPROVIDES_update-alternatives-dpkg += "update-alternatives" recipes-devtools/opkg/opkg.inc:RPROVIDES_update-alternatives-cworth += "update-alternatives"

If I use the ${VIRTUAL-RUNTIME_update-alternatives} that has the effect or hard coding which specific version of update-alternatives we're going to use.. (-dpg vs -cworth) I'm not sure this is really the desired behavior in this case -- if it is, it's easy enough to change of course.

Quoted 28 lines · Mark Hatle

Quoted 17 lines · Martin Jansa

Quoted 16 lines · Mark Hatle

When using update-alternatives, there should be a runtime dependency on update-alternatives. Without this, it's possible to get into a situation where the package is not installable.

Signed-off-by Mark Hatle <[email protected]>

---
   meta/classes/update-alternatives.bbclass |    6 ++++++
   1 files changed, 6 insertions(+), 0 deletions(-)

meta/classes/update-alternatives.bbclass +0 -0

index 4e1ff27..e432506 100644
@@ -304,6 +304,12 @@ python populate_packages_prepend () {
               alt_remove_links += '\tupdate-alternatives --remove  %s %s\n' % (alt_name, alt_target)
 

Quoted 9 lines

meta/classes/update-alternatives.bbclass python populate_packages_prepend () { · line 312

Quoted 7 lines

meta/classes/update-alternatives.bbclass +6 -0

           if alt_setup_links:
+            # RDEPENDS setup
+            bb.note('adding runtime requirement for update-alternatives for %s' % pkg)
+            rdepends = d.getVar('RDEPENDS_%s' % pkg, True) or ""
+            rdepends += ' ' + d.getVar('MLPREFIX') + 'update-alternatives'
+            d.setVar("RDEPENDS_%s" % pkg, rdepends)
+

I guess you should use VIRTUAL-RUNTIME_update-alternatives here

Quoted 1 line

I believe what I have here is correct.

No, Martin is right.

Quoted 8 lines

We don't care which update-alternatives
we use, just that one is used.

recipes-devtools/dpkg/dpkg.inc:RPROVIDES_update-alternatives-dpkg += "update-alternatives" recipes-devtools/opkg/opkg.inc:RPROVIDES_update-alternatives-cworth += "update-alternatives"

Quoted 4 lines

If I use the ${VIRTUAL-RUNTIME_update-alternatives} that has the effect or hard coding which specific version of update-alternatives we're going to use.. (-dpg vs -cworth) I'm not sure this is really the desired behavior in this case -- if it is, it's easy enough to change of course.

I keep telling people this and people keep ignoring me.

We DO NOT SUPPORT switching providers at runtime since its a package manager specific problem for which we currently have no general abstraction.

This leads to patches like:

http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=fe21ace36e19e06cbfdb83f73e60623bd4e382af

since the virtual/ space does not somehow magically work at runtime, worse it breaks the deb package backend.

PREFERRED_PROVIDER is a build time thing. virtual/ is a build time thing. How do I explain this any clearer?

The only mechanism for distro selection of runtime is VIRTUAL-RUNTIME_ which is pretty horrible and likely would be better done with something debian package renaming like since we already have that mangling code.

Cheers,

Richard

Quoted 6 lines · Richard Purdie

On Tue, 2012-12-04 at 11:34 -0600, Mark Hatle wrote:
I keep telling people this and people keep ignoring me.

We DO NOT SUPPORT switching providers at runtime since its a package manager specific problem for which we currently have no general abstraction.

We do support switching providers already, that's the whole alternatives system itself. What is different is in this case we can't use the update-alternatives.

But with the RPROVIDE of update-alternatives within the dpkg and opkg code.. We can certainly require 'update-alterantives' and the packaging systems will do the right thing (they have so far...)

Quoted 6 lines

This leads to patches like:

http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=fe21ace36e19e06cbfdb83f73e60623bd4e382af

since the virtual/ space does not somehow magically work at runtime, worse it breaks the deb package backend.

It works in RPM... but if it doesn't in deb (and ipk) I understand the limitations we are bound to. Limiting the character space (i.e. no '/') is different then saying we don't support RPROVIDES...

Quoted 2 lines

PREFERRED_PROVIDER is a build time thing. virtual/ is a build time thing. How do I explain this any clearer?

I'm still confused on the PREFERRED_PROVIDER honestly.

conf/distro/include/default-providers.inc:PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" conf/distro/include/default-providers.inc:PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"

There is no 'update-alternatives-cworth' recipe.. but there is an opkg recipe that happens to provide an update-alternatives-cworth -package-. So does PREFERRED_PROVIDER select packages or recipes?

Quoted 3 lines

The only mechanism for distro selection of runtime is VIRTUAL-RUNTIME_ which is pretty horrible and likely would be better done with something debian package renaming like since we already have that mangling code.

And the VIRTUAL-RUNTIME isn't a runtime selection, it's a build-time selection.

If we need to select this at build-time, we can.

I'm happy with changing the
patch, but as a distribution person I really don't care who provides this as long as something does.

The libtelepathy-glib-dev package contains a .pc file that has a requires of pkgconfig(pkg-config) > 0.21 in it. In order to satisfy this requirement we add a manual RPROVIDE to the pkgconfig package.

Signed-off-by Mark Hatle <[email protected]>

---
 meta/recipes-devtools/pkgconfig/pkgconfig.inc     |    5 +++++
 meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb |    2 +-
 meta/recipes-devtools/pkgconfig/pkgconfig_git.bb  |    1 +
 3 files changed, 7 insertions(+), 1 deletions(-)

(quoted diff) +0 -0

b/meta/recipes-devtools/pkgconfig/pkgconfig.inc index 83a9cdf..27d4071 100644

meta/recipes-devtools/pkgconfig/pkgconfig.inc +2 -0

@@ -37,3 +37,8 @@ BBCLASSEXTEND = "native nativesdk"
 # files.
 FILES_${PN}-dev = ""
 FILES_${PN} += "${datadir}/aclocal/pkg.m4"
+
+# When using the RPM generated automatic package dependencies, some

packages +# will end up requiring 'pkgconfig(pkg-config)'. Allow this behavior by +# specifying an appropriate provide.

meta/recipes-devtools/pkgconfig/pkgconfig.inc +1 -0

+RPROVIDES_${PN} += "pkgconfig(pkg-config) (= ${PV})"

(quoted diff) +0 -0

b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb index 1e60c54..d0a2b1f 100644

meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb +1 -1

@@ -1,6 +1,6 @@
 require pkgconfig.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745"
 SRC_URI[sha256sum] =

"3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e" diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb index 6271992..d5ec8fc 100644

Quoted 45 lines · On Tuesday 04 December 2012 11:14:52 Mark Hatle wrote:

The libtelepathy-glib-dev package contains a .pc file that has a requires of pkgconfig(pkg-config) > 0.21 in it. In order to satisfy this requirement we add a manual RPROVIDE to the pkgconfig package.

Signed-off-by Mark Hatle <[email protected]>

---
  meta/recipes-devtools/pkgconfig/pkgconfig.inc     |    5 +++++
  meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb |    2 +-
  meta/recipes-devtools/pkgconfig/pkgconfig_git.bb  |    1 +
  3 files changed, 7 insertions(+), 1 deletions(-)

(quoted diff) +0 -0

b/meta/recipes-devtools/pkgconfig/pkgconfig.inc index 83a9cdf..27d4071 100644

meta/recipes-devtools/pkgconfig/pkgconfig.inc +2 -0

@@ -37,3 +37,8 @@ BBCLASSEXTEND = "native nativesdk"
  # files.
  FILES_${PN}-dev = ""
  FILES_${PN} += "${datadir}/aclocal/pkg.m4"
+
+# When using the RPM generated automatic package dependencies, some

packages +# will end up requiring 'pkgconfig(pkg-config)'. Allow this behavior by +# specifying an appropriate provide.

meta/recipes-devtools/pkgconfig/pkgconfig.inc +1 -0

+RPROVIDES_${PN} += "pkgconfig(pkg-config) (= ${PV})"

(quoted diff) +0 -0

b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb index 1e60c54..d0a2b1f 100644

meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb +1 -1

@@ -1,6 +1,6 @@
  require pkgconfig.inc
 
-PR = "r5"
+PR = "r6"
 
  SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745"
  SRC_URI[sha256sum] =

"3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e" diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb index 6271992..d5ec8fc 100644

meta/recipes-devtools/pkgconfig/pkgconfig_git.bb S = "${WORKDIR}/git/" · line 13

Quoted 6 lines

meta/recipes-devtools/pkgconfig/pkgconfig_git.bb +1 -0

@@ -8,6 +8,7 @@ S = "${WORKDIR}/git/"
 
  SRCREV = "66d49f1375fec838bcd301bb4ca2ef76cee0e47c"
  PV = "0.23+git${SRCPV}"
+PR = "r1"
 
  DEFAULT_PREFERENCE = "-1"

Because this tends to come in via file dependencies generated during do_package, a package for pkgconfig won't be forced to be built; so if nothing else depends upon pkgconfig then you can get a failure during do_rootfs (as I have here building core-image-lsb with DISTRO = "poky-lsb" from scratch with these changes on top of master):

| Note: to be installed:  psplash@i586 packagegroup-core-basic@all
| packagegroup-core-ssh-openssh@all packagegroup-core-lsb@all
| packagegroup-base-extended@qemux86 packagegroup-core-boot@qemux86
| locale-base-en-us@i586 locale-base-en-gb@i586
| Loading cache...
| Updating cache...               ########################################
[100%]
|
| Computing transaction...error: Can't install libz-dev-1.2.7-r0@i586:
| no package provides pkgconfig

I'm not quite sure what the best fix for that is though.

Cheers,
Paul

The libtelepathy-glib-dev package contains a .pc file that has a requires of pkgconfig(pkg-config) > 0.21 in it. In order to satisfy this requirement
we add a manual RPROVIDE to the pkgconfig package.

Signed-off-by Mark Hatle <[email protected]>

On Tue, Dec 4, 2012 at 3:14 PM, Mark Hatle <[email protected] <mailto:[email protected]>> wrote:

The libtelepathy-glib-dev package contains a .pc file that has a requires of pkgconfig(pkg-config) > 0.21 in it. In order to satisfy this requirement we add a manual RPROVIDE to the pkgconfig package.

Signed-off-by Mark Hatle <[email protected]

<mailto:[email protected]>>

Have this been tested using ipk and deb packages?

I don't know if the format used, of rprovides, is supported by them (or abstracted by bitbake).

--
Otavio Salvador O.S. Systems
E-mail: [email protected] <mailto:[email protected]>
http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br

Pseudo was not building and installing properly for systems where baselib was not 'lib'. This change reworks the three scenerios to work properly.

Signed-off-by Mark Hatle <[email protected]>

---
  meta/recipes-devtools/pseudo/pseudo.inc      |   58 ++++++++++++-------------
  meta/recipes-devtools/pseudo/pseudo_1.4.1.bb |    2 +-
  meta/recipes-devtools/pseudo/pseudo_git.bb   |    2 +-
  3 files changed, 30 insertions(+), 32 deletions(-)

meta/recipes-devtools/pseudo/pseudo.inc +2 -10

index 98f706c..8dc7d72 100644
@@ -13,34 +13,28 @@ SRC_URI_append_class-nativesdk = " file://symver.patch"
 
  SRC_URI_append_class-native = " file://symver.patch"
 
-FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
-FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug"
+FILES_${PN} = "${prefix}/lib/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
+FILES_${PN}-dbg += "${prefix}/lib/pseudo/lib*/.debug"
  PROVIDES += "virtual/fakeroot"
 
  MAKEOPTS = ""
 
  inherit siteinfo
 
-do_configure () {
-	:
-}
-
-NO32LIBS ??= "1"
-
-# Compile for the local machine arch...
-do_compile () {

meta/recipes-devtools/pseudo/pseudo.inc +22 -17

  }
 
-# Two below are the same
+NO32LIBS ??= "1"
+
  # If necessary compile for the alternative machine arch.  This is only
  # necessary in a native build.
-do_compile_prepend_class-native () {
+do_compile_native() {
  	if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
  		# We need the 32-bit libpseudo on a 64-bit machine...
                  # ... and we really, really, hope that the native host is

@@ -56,18 +50,20 @@ do_compile_prepend_class-native () {
  		# prevent it from removing the lib, but remove everything else
  		make 'LIB=foo' ${MAKEOPTS} distclean
  	fi
+	if [ "${SITEINFO_BITS}" = "64" ]; then
+	  ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
+	else
+	  ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
+	fi
+	oe_runmake ${MAKEOPTS}
  }
 
-do_compile_prepend_class-nativesdk () {
-	if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
-		# We need the 32-bit libpseudo on a 64-bit machine...
-                # ... and we really, really, hope that the native host is
-                # x86, or else --bits may not work.
-		./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
-		oe_runmake ${MAKEOPTS} libpseudo
-		# prevent it from removing the lib, but remove everything else
-		make 'LIB=foo' ${MAKEOPTS} distclean
-	fi
+do_compile_class-native () {
+	do_compile_native
+}
+
+do_compile_class-nativesdk () {
+	do_compile_native
  }
 
  do_install () {

@@ -77,18 +73,20 @@ do_install () {
  # Two below are the same
  # If necessary install for the alternative machine arch.  This is only
  # necessary in a native build.
-do_install_append_class-native () {
+do_install_native () {
  	if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
  		mkdir -p ${D}${prefix}/lib/pseudo/lib
  		cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
  	fi
+	oe_runmake 'DESTDIR=${D}' ${MAKEOPTS} 'LIB=lib/pseudo/lib$(MARK64)' install
+}
+
+do_install_class-native () {
+	do_install_native
  }
 
  do_install_append_class-nativesdk () {
-	if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
-		mkdir -p ${D}${prefix}/lib/pseudo/lib
-		cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
-	fi
+	do_install_native
  }
 
  BBCLASSEXTEND = "native nativesdk"

meta/recipes-devtools/pseudo/pseudo_1.4.1.bb +1 -1

index 70fe9c0..8367a34 100644
@@ -1,6 +1,6 @@
  require pseudo.inc
 
-PR = "r13"
+PR = "r14"
 
  SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2"
 

meta/recipes-devtools/pseudo/pseudo_git.bb +1 -1

index e394ffb..c8ec5ad 100644
@@ -2,7 +2,7 @@ require pseudo.inc
 
  SRCREV = "398a264490713c912b4ce465251a8a82a7905f45"
  PV = "1.4.1+git${SRCPV}"
-PR = "r28"
+PR = "r29"
 
  DEFAULT_PREFERENCE = "-1"
 

Quoted 42 lines · Mark Hatle

Pseudo was not building and installing properly for systems where baselib was not 'lib'. This change reworks the three scenerios to work properly.

Signed-off-by Mark Hatle <[email protected]>

---
   meta/recipes-devtools/pseudo/pseudo.inc      |   58 ++++++++++++-------------
   meta/recipes-devtools/pseudo/pseudo_1.4.1.bb |    2 +-
   meta/recipes-devtools/pseudo/pseudo_git.bb   |    2 +-
   3 files changed, 30 insertions(+), 32 deletions(-)

meta/recipes-devtools/pseudo/pseudo.inc +4 -12

index 98f706c..8dc7d72 100644
@@ -13,34 +13,28 @@ SRC_URI_append_class-nativesdk = " file://symver.patch"
 
   SRC_URI_append_class-native = " file://symver.patch"
 
-FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
-FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug"
+FILES_${PN} = "${prefix}/lib/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
+FILES_${PN}-dbg += "${prefix}/lib/pseudo/lib*/.debug"
   PROVIDES += "virtual/fakeroot"
 
   MAKEOPTS = ""
 
   inherit siteinfo
 
-do_configure () {
-	:
-}
-
-NO32LIBS ??= "1"
-
-# Compile for the local machine arch...
-do_compile () {
+do_configure_class-target () {
   	if [ "${SITEINFO_BITS}" = "64" ]; then
-	  ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
+		mylibdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS}
   	else
-	  ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath

meta/recipes-devtools/pseudo/pseudo.inc SRC_URI_append_class-nativesdk = " file://symver.patch" · line 30

Quoted 4 lines

meta/recipes-devtools/pseudo/pseudo.inc +2 -1

+		mylibdir=${prefix}/lib/pseudo/lib
   	fi
-	oe_runmake ${MAKEOPTS}
+	${S}/configure --prefix=${prefix} --libdir=$mylibdir --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --without-rpath

You seem to have dropped the --with-sqlite and now it does not find sqlite3.h for the target build as can be seen in the build appliance failure.

http://autobuilder.yoctoproject.org:8010/builders/build-appliance/builds/154/steps/shell_46/logs/stdio

Sau!

Quoted 95 lines

meta/recipes-devtools/pseudo/pseudo.inc +22 -17

   }
 
-# Two below are the same
+NO32LIBS ??= "1"
+
   # If necessary compile for the alternative machine arch.  This is only
   # necessary in a native build.
-do_compile_prepend_class-native () {
+do_compile_native() {
   	if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
   		# We need the 32-bit libpseudo on a 64-bit machine...
                   # ... and we really, really, hope that the native host is

@@ -56,18 +50,20 @@ do_compile_prepend_class-native () {
   		# prevent it from removing the lib, but remove everything else
   		make 'LIB=foo' ${MAKEOPTS} distclean
   	fi
+	if [ "${SITEINFO_BITS}" = "64" ]; then
+	  ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
+	else
+	  ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
+	fi
+	oe_runmake ${MAKEOPTS}
   }
 
-do_compile_prepend_class-nativesdk () {
-	if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
-		# We need the 32-bit libpseudo on a 64-bit machine...
-                # ... and we really, really, hope that the native host is
-                # x86, or else --bits may not work.
-		./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
-		oe_runmake ${MAKEOPTS} libpseudo
-		# prevent it from removing the lib, but remove everything else
-		make 'LIB=foo' ${MAKEOPTS} distclean
-	fi
+do_compile_class-native () {
+	do_compile_native
+}
+
+do_compile_class-nativesdk () {
+	do_compile_native
   }
 
   do_install () {

@@ -77,18 +73,20 @@ do_install () {
   # Two below are the same
   # If necessary install for the alternative machine arch.  This is only
   # necessary in a native build.
-do_install_append_class-native () {
+do_install_native () {
   	if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
   		mkdir -p ${D}${prefix}/lib/pseudo/lib
   		cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
   	fi
+	oe_runmake 'DESTDIR=${D}' ${MAKEOPTS} 'LIB=lib/pseudo/lib$(MARK64)' install
+}
+
+do_install_class-native () {
+	do_install_native
   }
 
   do_install_append_class-nativesdk () {
-	if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
-		mkdir -p ${D}${prefix}/lib/pseudo/lib
-		cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
-	fi
+	do_install_native
   }
 
   BBCLASSEXTEND = "native nativesdk"

meta/recipes-devtools/pseudo/pseudo_1.4.1.bb +1 -1

index 70fe9c0..8367a34 100644
@@ -1,6 +1,6 @@
   require pseudo.inc
 
-PR = "r13"
+PR = "r14"
 
   SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2"
 

meta/recipes-devtools/pseudo/pseudo_git.bb +1 -1

index e394ffb..c8ec5ad 100644
@@ -2,7 +2,7 @@ require pseudo.inc
 
   SRCREV = "398a264490713c912b4ce465251a8a82a7905f45"
   PV = "1.4.1+git${SRCPV}"
-PR = "r28"
+PR = "r29"
 
   DEFAULT_PREFERENCE = "-1"
 

Quoted 59 lines · Saul Wold

Quoted 58 lines · Mark Hatle

Pseudo was not building and installing properly for systems where baselib
was not 'lib'. This change reworks the three scenerios to work properly.

Signed-off-by Mark Hatle <[email protected]>

---
   meta/recipes-devtools/pseudo/pseudo.inc      |   58
++++++++++++-------------
   meta/recipes-devtools/pseudo/pseudo_1.4.1.bb |    2 +-
   meta/recipes-devtools/pseudo/pseudo_git.bb   |    2 +-
   3 files changed, 30 insertions(+), 32 deletions(-)

meta/recipes-devtools/pseudo/pseudo.inc +0 -0

index 98f706c..8dc7d72 100644
@@ -13,34 +13,28 @@ SRC_URI_append_class-nativesdk = "

file://symver.patch"

SRC_URI_append_class-native = " file://symver.patch"

-FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"

meta/recipes-devtools/pseudo/pseudo.inc +1 -1

-FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug"
+FILES_${PN} = "${prefix}/lib/pseudo/lib*/libpseudo.so ${bindir}/*

${localstatedir}/pseudo ${prefix}/var/pseudo"

meta/recipes-devtools/pseudo/pseudo.inc +4 -18

+FILES_${PN}-dbg += "${prefix}/lib/pseudo/lib*/.debug"
   PROVIDES += "virtual/fakeroot"
 
   MAKEOPTS = ""
 
   inherit siteinfo
 
-do_configure () {
-    :
-}
-
-NO32LIBS ??= "1"
-
-# Compile for the local machine arch...
-do_compile () {
+do_configure_class-target () {
       if [ "${SITEINFO_BITS}" = "64" ]; then
-      ${S}/configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS}
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix}
--cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite
--without-rpath
+        mylibdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS}
       else
-      ${S}/configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix}
--cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite
--without-rpath
+        mylibdir=${prefix}/lib/pseudo/lib

Quoted 8 lines

meta/recipes-devtools/pseudo/pseudo.inc

Quoted 4 lines

fi

meta/recipes-devtools/pseudo/pseudo.inc +1 -2

-    oe_runmake ${MAKEOPTS}
+    ${S}/configure --prefix=${prefix} --libdir=$mylibdir
--cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --without-rpath

You seem to have dropped the --with-sqlite and now it does not find sqlite3.h for the target build as can be seen in the build appliance failure.

It should be sourcing it from the compiler with a #include. It was working on all of my test builds.

But either way, there are two bugs here.. the first is pseudo isn't building for the target -- it wasn't before either.

But the real issue is -why on earth- are we building pseudo at all for the target. It serves no purpose that I am aware of.

I'd prefer if the fix was simply to disable pseudo for target-class builds, and only build it for -native and -nativesdk cases.

Just drop this patch for now -- we can focus on fixing it a different way if target builds of pseudo are needed for some reason.

--Mark

Quoted 128 lines

http://autobuilder.yoctoproject.org:8010/builders/build-appliance/builds/154/steps/shell_46/logs/stdio

Sau!

Quoted 123 lines

   }

meta/recipes-devtools/pseudo/pseudo.inc +2 -1

-# Two below are the same
+NO32LIBS ??= "1"
+
   # If necessary compile for the alternative machine arch.  This is

only

   # necessary in a native build.

meta/recipes-devtools/pseudo/pseudo.inc +1 -1

-do_compile_prepend_class-native () {
+do_compile_native() {
       if [ "${SITEINFO_BITS}" = "64" -a -e

"/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
# We need the 32-bit libpseudo on a 64-bit machine...
# ... and we really, really, hope that the native
host is

meta/recipes-devtools/pseudo/pseudo.inc +0 -0

@@ -56,18 +50,20 @@ do_compile_prepend_class-native () {
           # prevent it from removing the lib, but remove everything

else

           make 'LIB=foo' ${MAKEOPTS} distclean
       fi

meta/recipes-devtools/pseudo/pseudo.inc +6 -10

+    if [ "${SITEINFO_BITS}" = "64" ]; then
+      ${S}/configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS}
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix}
--cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite
--without-rpath
+    else
+      ${S}/configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix}
--cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite
--without-rpath
+    fi
+    oe_runmake ${MAKEOPTS}
   }
 
-do_compile_prepend_class-nativesdk () {
-    if [ "${SITEINFO_BITS}" = "64" -a -e

"/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then

meta/recipes-devtools/pseudo/pseudo.inc +0 -2

-        # We need the 32-bit libpseudo on a 64-bit machine...
-                # ... and we really, really, hope that the native

host is

meta/recipes-devtools/pseudo/pseudo.inc +6 -9

-                # x86, or else --bits may not work.
-        ./configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
--without-rpath
-        oe_runmake ${MAKEOPTS} libpseudo
-        # prevent it from removing the lib, but remove everything else
-        make 'LIB=foo' ${MAKEOPTS} distclean
-    fi
+do_compile_class-native () {
+    do_compile_native
+}
+
+do_compile_class-nativesdk () {
+    do_compile_native
   }
 
   do_install () {

@@ -77,18 +73,20 @@ do_install () {
   # Two below are the same
   # If necessary install for the alternative machine arch.  This is

only

   # necessary in a native build.

meta/recipes-devtools/pseudo/pseudo.inc +1 -1

-do_install_append_class-native () {
+do_install_native () {
       if [ "${SITEINFO_BITS}" = "64" -a -e

"/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then

           mkdir -p ${D}${prefix}/lib/pseudo/lib
           cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
       fi

+ oe_runmake 'DESTDIR=${D}' ${MAKEOPTS}
'LIB=lib/pseudo/lib$(MARK64)' install

meta/recipes-devtools/pseudo/pseudo.inc +4 -1

+}
+
+do_install_class-native () {
+    do_install_native
   }
 
   do_install_append_class-nativesdk () {
-    if [ "${SITEINFO_BITS}" = "64" -a -e

"/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then

meta/recipes-devtools/pseudo/pseudo.inc +1 -3

-        mkdir -p ${D}${prefix}/lib/pseudo/lib
-        cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
-    fi
+    do_install_native
   }
 
   BBCLASSEXTEND = "native nativesdk"

meta/recipes-devtools/pseudo/pseudo_1.4.1.bb +1 -1

index 70fe9c0..8367a34 100644
@@ -1,6 +1,6 @@
   require pseudo.inc
 
-PR = "r13"
+PR = "r14"
 
   SRC_URI =

"http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2"

meta/recipes-devtools/pseudo/pseudo_git.bb +1 -1

index e394ffb..c8ec5ad 100644
@@ -2,7 +2,7 @@ require pseudo.inc
 
   SRCREV = "398a264490713c912b4ce465251a8a82a7905f45"
   PV = "1.4.1+git${SRCPV}"
-PR = "r28"
+PR = "r29"
 
   DEFAULT_PREFERENCE = "-1"
 

Quoted 69 lines · Mark Hatle

Quoted 59 lines · Saul Wold

Quoted 58 lines · Mark Hatle

Pseudo was not building and installing properly for systems where baselib
was not 'lib'. This change reworks the three scenerios to work properly.

Signed-off-by Mark Hatle <[email protected]>

---
    meta/recipes-devtools/pseudo/pseudo.inc      |   58
++++++++++++-------------
    meta/recipes-devtools/pseudo/pseudo_1.4.1.bb |    2 +-
    meta/recipes-devtools/pseudo/pseudo_git.bb   |    2 +-
    3 files changed, 30 insertions(+), 32 deletions(-)

meta/recipes-devtools/pseudo/pseudo.inc +0 -0

index 98f706c..8dc7d72 100644
@@ -13,34 +13,28 @@ SRC_URI_append_class-nativesdk = "

file://symver.patch"

SRC_URI_append_class-native = " file://symver.patch"

-FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"

meta/recipes-devtools/pseudo/pseudo.inc +1 -1

-FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug"
+FILES_${PN} = "${prefix}/lib/pseudo/lib*/libpseudo.so ${bindir}/*

${localstatedir}/pseudo ${prefix}/var/pseudo"

meta/recipes-devtools/pseudo/pseudo.inc +4 -18

+FILES_${PN}-dbg += "${prefix}/lib/pseudo/lib*/.debug"
    PROVIDES += "virtual/fakeroot"
 
    MAKEOPTS = ""
 
    inherit siteinfo
 
-do_configure () {
-    :
-}
-
-NO32LIBS ??= "1"
-
-# Compile for the local machine arch...
-do_compile () {
+do_configure_class-target () {
        if [ "${SITEINFO_BITS}" = "64" ]; then
-      ${S}/configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS}
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix}
--cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite
--without-rpath
+        mylibdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS}
        else
-      ${S}/configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix}
--cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite
--without-rpath
+        mylibdir=${prefix}/lib/pseudo/lib

Quoted 8 lines

meta/recipes-devtools/pseudo/pseudo.inc

Quoted 4 lines

fi

meta/recipes-devtools/pseudo/pseudo.inc +1 -2

-    oe_runmake ${MAKEOPTS}
+    ${S}/configure --prefix=${prefix} --libdir=$mylibdir
--cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --without-rpath

You seem to have dropped the --with-sqlite and now it does not find sqlite3.h for the target build as can be seen in the build appliance failure.

Quoted 3 lines

It should be sourcing it from the compiler with a #include. It was working on all of my test builds.

Not that I am aware of, the configure script defaults to /usr, is it possible you have a host contamination issue with sqlite3 installed on your machine?

Quoted 3 lines

But either way, there are two bugs here.. the first is pseudo isn't building for the target -- it wasn't before either.

It has been building on the target in the past since we need it for the Build Appliance and it builds in world.

Quoted 3 lines

But the real issue is -why on earth- are we building pseudo at all for the target. It serves no purpose that I am aware of.

Build Appliance needs it.

Quoted 3 lines

I'd prefer if the fix was simply to disable pseudo for target-class builds, and only build it for -native and -nativesdk cases.

Not really an option

Quoted 3 lines

Just drop this patch for now -- we can focus on fixing it a different way if target builds of pseudo are needed for some reason.

consider it dropped.

Sau!

Quoted 133 lines

--Mark

Quoted 128 lines

http://autobuilder.yoctoproject.org:8010/builders/build-appliance/builds/154/steps/shell_46/logs/stdio

Sau!

Quoted 123 lines

    }

meta/recipes-devtools/pseudo/pseudo.inc +2 -1

-# Two below are the same
+NO32LIBS ??= "1"
+
    # If necessary compile for the alternative machine arch.  This is

only

    # necessary in a native build.

meta/recipes-devtools/pseudo/pseudo.inc +1 -1

-do_compile_prepend_class-native () {
+do_compile_native() {
        if [ "${SITEINFO_BITS}" = "64" -a -e

"/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
# We need the 32-bit libpseudo on a 64-bit machine...
# ... and we really, really, hope that the native
host is

meta/recipes-devtools/pseudo/pseudo.inc +0 -0

@@ -56,18 +50,20 @@ do_compile_prepend_class-native () {
            # prevent it from removing the lib, but remove everything

else

            make 'LIB=foo' ${MAKEOPTS} distclean
        fi

meta/recipes-devtools/pseudo/pseudo.inc +6 -10

+    if [ "${SITEINFO_BITS}" = "64" ]; then
+      ${S}/configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS}
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix}
--cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite
--without-rpath
+    else
+      ${S}/configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix}
--cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite
--without-rpath
+    fi
+    oe_runmake ${MAKEOPTS}
    }
 
-do_compile_prepend_class-nativesdk () {
-    if [ "${SITEINFO_BITS}" = "64" -a -e

"/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then

meta/recipes-devtools/pseudo/pseudo.inc +0 -2

-        # We need the 32-bit libpseudo on a 64-bit machine...
-                # ... and we really, really, hope that the native

host is

meta/recipes-devtools/pseudo/pseudo.inc +6 -9

-                # x86, or else --bits may not work.
-        ./configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
--without-rpath
-        oe_runmake ${MAKEOPTS} libpseudo
-        # prevent it from removing the lib, but remove everything else
-        make 'LIB=foo' ${MAKEOPTS} distclean
-    fi
+do_compile_class-native () {
+    do_compile_native
+}
+
+do_compile_class-nativesdk () {
+    do_compile_native
    }
 
    do_install () {

@@ -77,18 +73,20 @@ do_install () {
    # Two below are the same
    # If necessary install for the alternative machine arch.  This is

only

    # necessary in a native build.

meta/recipes-devtools/pseudo/pseudo.inc +1 -1

-do_install_append_class-native () {
+do_install_native () {
        if [ "${SITEINFO_BITS}" = "64" -a -e

"/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then

            mkdir -p ${D}${prefix}/lib/pseudo/lib
            cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
        fi

+ oe_runmake 'DESTDIR=${D}' ${MAKEOPTS}
'LIB=lib/pseudo/lib$(MARK64)' install

meta/recipes-devtools/pseudo/pseudo.inc +4 -1

+}
+
+do_install_class-native () {
+    do_install_native
    }
 
    do_install_append_class-nativesdk () {
-    if [ "${SITEINFO_BITS}" = "64" -a -e

"/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then

meta/recipes-devtools/pseudo/pseudo.inc +1 -3

-        mkdir -p ${D}${prefix}/lib/pseudo/lib
-        cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
-    fi
+    do_install_native
    }
 
    BBCLASSEXTEND = "native nativesdk"

meta/recipes-devtools/pseudo/pseudo_1.4.1.bb +1 -1

index 70fe9c0..8367a34 100644
@@ -1,6 +1,6 @@
    require pseudo.inc
 
-PR = "r13"
+PR = "r14"
 
    SRC_URI =

"http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2"

meta/recipes-devtools/pseudo/pseudo_git.bb +1 -1

index e394ffb..c8ec5ad 100644
@@ -2,7 +2,7 @@ require pseudo.inc
 
    SRCREV = "398a264490713c912b4ce465251a8a82a7905f45"
    PV = "1.4.1+git${SRCPV}"
-PR = "r28"
+PR = "r29"
 
    DEFAULT_PREFERENCE = "-1"
 

Quoted 77 lines · Saul Wold

Quoted 69 lines · Mark Hatle

Quoted 59 lines · Saul Wold

Quoted 58 lines · Mark Hatle

Pseudo was not building and installing properly for systems where baselib
was not 'lib'. This change reworks the three scenerios to work properly.

Signed-off-by Mark Hatle <[email protected]>

---
    meta/recipes-devtools/pseudo/pseudo.inc      |   58
++++++++++++-------------
    meta/recipes-devtools/pseudo/pseudo_1.4.1.bb |    2 +-
    meta/recipes-devtools/pseudo/pseudo_git.bb   |    2 +-
    3 files changed, 30 insertions(+), 32 deletions(-)

meta/recipes-devtools/pseudo/pseudo.inc +0 -0

index 98f706c..8dc7d72 100644
@@ -13,34 +13,28 @@ SRC_URI_append_class-nativesdk = "

file://symver.patch"

SRC_URI_append_class-native = " file://symver.patch"

-FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"

meta/recipes-devtools/pseudo/pseudo.inc +1 -1

-FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug"
+FILES_${PN} = "${prefix}/lib/pseudo/lib*/libpseudo.so ${bindir}/*

${localstatedir}/pseudo ${prefix}/var/pseudo"

meta/recipes-devtools/pseudo/pseudo.inc +4 -18

+FILES_${PN}-dbg += "${prefix}/lib/pseudo/lib*/.debug"
    PROVIDES += "virtual/fakeroot"
 
    MAKEOPTS = ""
 
    inherit siteinfo
 
-do_configure () {
-    :
-}
-
-NO32LIBS ??= "1"
-
-# Compile for the local machine arch...
-do_compile () {
+do_configure_class-target () {
        if [ "${SITEINFO_BITS}" = "64" ]; then
-      ${S}/configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS}
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix}
--cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite
--without-rpath
+        mylibdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS}
        else
-      ${S}/configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix}
--cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite
--without-rpath
+        mylibdir=${prefix}/lib/pseudo/lib

Quoted 8 lines

meta/recipes-devtools/pseudo/pseudo.inc

Quoted 4 lines

fi

meta/recipes-devtools/pseudo/pseudo.inc +1 -2

-    oe_runmake ${MAKEOPTS}
+    ${S}/configure --prefix=${prefix} --libdir=$mylibdir
--cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --without-rpath

You seem to have dropped the --with-sqlite and now it does not find sqlite3.h for the target build as can be seen in the build appliance failure.

Quoted 3 lines

It should be sourcing it from the compiler with a #include. It was working on all of my test builds.

Not that I am aware of, the configure script defaults to /usr, is it possible you have a host contamination issue with sqlite3 installed on your machine?

Quoted 5 lines

Quoted 3 lines

But either way, there are two bugs here.. the first is pseudo isn't building for the target -- it wasn't before either.

It has been building on the target in the past since we need it for the Build Appliance and it builds in world.

Enable multilibs, pseudo (target) will no longer build. The integration is hard coded currently to be looking for things in the 'lib' directory, which may not exist. In otherwords, it is broken -- and the autobuilds are missing any build-time tests for multilibs at this point.

Quoted 4 lines

Quoted 3 lines

But the real issue is -why on earth- are we building pseudo at all for the target. It serves no purpose that I am aware of.

Build Appliance needs it.

People keep telling me this, but honestly I can't figure out why it's needed. What actually uses pseudo in the build appliance?

I can easily build a system today, boot it, download OE-Core/Bitbake (or Poky) and build it on that system. It's that the purpose of the build appliance? Why is it needed?

Quoted 148 lines

Quoted 3 lines

I'd prefer if the fix was simply to disable pseudo for target-class builds, and only build it for -native and -nativesdk cases.

Not really an option

Quoted 3 lines

Just drop this patch for now -- we can focus on fixing it a different way if target builds of pseudo are needed for some reason.

consider it dropped.

Sau!

Quoted 136 lines

--Mark

Quoted 131 lines

http://autobuilder.yoctoproject.org:8010/builders/build-appliance/builds/154/steps/shell_46/logs/stdio

Sau!

Quoted 125 lines

    }

meta/recipes-devtools/pseudo/pseudo.inc +2 -1

-# Two below are the same
+NO32LIBS ??= "1"
+
    # If necessary compile for the alternative machine arch.  This is

only

    # necessary in a native build.

meta/recipes-devtools/pseudo/pseudo.inc +1 -1

-do_compile_prepend_class-native () {
+do_compile_native() {
        if [ "${SITEINFO_BITS}" = "64" -a -e

"/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
# We need the 32-bit libpseudo on a 64-bit machine...
# ... and we really, really, hope that the native
host is

meta/recipes-devtools/pseudo/pseudo.inc +0 -0

@@ -56,18 +50,20 @@ do_compile_prepend_class-native () {
            # prevent it from removing the lib, but remove everything

else

            make 'LIB=foo' ${MAKEOPTS} distclean
        fi

meta/recipes-devtools/pseudo/pseudo.inc +6 -10

+    if [ "${SITEINFO_BITS}" = "64" ]; then
+      ${S}/configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS}
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix}
--cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite
--without-rpath
+    else
+      ${S}/configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix}
--cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite
--without-rpath
+    fi
+    oe_runmake ${MAKEOPTS}
    }
 
-do_compile_prepend_class-nativesdk () {
-    if [ "${SITEINFO_BITS}" = "64" -a -e

"/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then

meta/recipes-devtools/pseudo/pseudo.inc +0 -2

-        # We need the 32-bit libpseudo on a 64-bit machine...
-                # ... and we really, really, hope that the native

host is

meta/recipes-devtools/pseudo/pseudo.inc +0 -7

-                # x86, or else --bits may not work.
-        ./configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
--without-rpath
-        oe_runmake ${MAKEOPTS} libpseudo
-        # prevent it from removing the lib, but remove everything

else

meta/recipes-devtools/pseudo/pseudo.inc +6 -2

-        make 'LIB=foo' ${MAKEOPTS} distclean
-    fi
+do_compile_class-native () {
+    do_compile_native
+}
+
+do_compile_class-nativesdk () {
+    do_compile_native
    }
 
    do_install () {

@@ -77,18 +73,20 @@ do_install () {
    # Two below are the same
    # If necessary install for the alternative machine arch.  This is

only

    # necessary in a native build.

meta/recipes-devtools/pseudo/pseudo.inc +1 -1

-do_install_append_class-native () {
+do_install_native () {
        if [ "${SITEINFO_BITS}" = "64" -a -e

"/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then

            mkdir -p ${D}${prefix}/lib/pseudo/lib
            cp lib/pseudo/lib/libpseudo.so

${D}${prefix}/lib/pseudo/lib/.
fi
+ oe_runmake 'DESTDIR=${D}' ${MAKEOPTS}
'LIB=lib/pseudo/lib$(MARK64)' install

meta/recipes-devtools/pseudo/pseudo.inc +4 -1

+}
+
+do_install_class-native () {
+    do_install_native
    }
 
    do_install_append_class-nativesdk () {
-    if [ "${SITEINFO_BITS}" = "64" -a -e

"/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then

meta/recipes-devtools/pseudo/pseudo.inc +1 -3

-        mkdir -p ${D}${prefix}/lib/pseudo/lib
-        cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
-    fi
+    do_install_native
    }
 
    BBCLASSEXTEND = "native nativesdk"

meta/recipes-devtools/pseudo/pseudo_1.4.1.bb +1 -1

index 70fe9c0..8367a34 100644
@@ -1,6 +1,6 @@
    require pseudo.inc
 
-PR = "r13"
+PR = "r14"
 
    SRC_URI =

"http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2"

meta/recipes-devtools/pseudo/pseudo_git.bb +1 -1

index e394ffb..c8ec5ad 100644
@@ -2,7 +2,7 @@ require pseudo.inc
 
    SRCREV = "398a264490713c912b4ce465251a8a82a7905f45"
    PV = "1.4.1+git${SRCPV}"
-PR = "r28"
+PR = "r29"
 
    DEFAULT_PREFERENCE = "-1"