Skip to contentSkip to conversation

mesa depending on samba or samba depending on extern talloc?

PATCH In review Martin Jansa 3 participants 7 messages Dec 21, 2010

lore
Share & tools
lore
#0 lore raw

On 2010-10-20 I've pushed newer mesa-7.9
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=30a3ea891d4511059a51882674f33aff2dddb96e
which depends on talloc
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=fabce288e40037d28c70f0f034185176f85e8664
and separate talloc recipe (because building whole samba just to provide talloc for mesa seems wrong and samba produced ICE before khem's fix)
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=afce52663d6b5b79c097136fa794dd3f76a4afff

Today I noticed, that usr/lib/pkgconfig/talloc.pc from talloc recipe was enough for mesa to compile, but because there was no libtalloc.so link it wasn't used in the end (as ldd confirms).

so talloc stages:
bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.*
-rwxr-xr-x 1 bitbake bitbake 32K Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.a -rwxr-xr-x 1 bitbake bitbake 73K Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so.2.0.1 bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/pkgconfig/talloc.pc -rw-r--r-- 1 bitbake bitbake 251 Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/pkgconfig/talloc.pc

samba adds:
bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.*
lrwxrwxrwx 1 bitbake bitbake 14 Dec 14 13:33 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so -> libtalloc.so.1
-rwxr-xr-x 1 bitbake bitbake 123K Dec 14 13:33 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so.1

now for sure I don't want to install whole samba on target (just for libtalloc) so I have few options

1) fix talloc to install libtalloc.so -> libtalloc.so.2.0.1 (conflicts with samba in sysroot) 2a) move libtalloc to separate package in samba recipe and make mesa depending on samba 2b) move libtalloc to separate package in samba recipe in case someone builds
it before mesa, but still depend only on fixed talloc
3) fix talloc + force samba build to use already installed libtalloc instead of building own version

Option 3) looks best, but I'm not sure how tightly samba depends on talloc and don't have time to test all samba versions we currently have (3.0.23c, 3.0.34, 3.2.15, 3.3.0, 3.3.9, 3.5.6), so 2b) looks as easier fix.

CCed 2 samba maintainers (wrt MAINTAINERS file) or if there is someone who cares about samba
recipes: can you clean recipes/samba a bit and provide some feedback on talloc issue?

Regards,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw

PATCH 2/2 samba: use external talloc instead of building own

* libtalloc now conflicts with libtalloc from talloc recipe
* tested only with samba-3.2.15

---
 recipes/samba/samba.inc       |    3 ++-
 recipes/samba/samba_3.2.15.bb |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
recipes/samba/samba.inc +2 -1
index a95106d..e5fa06e 100644
@@ -1,6 +1,6 @@
 SECTION = "console/network"
 LICENSE = "GPL"
-DEPENDS = "readline virtual/libiconv"
+DEPENDS = "readline virtual/libiconv talloc"
 
 SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
            file://volatiles.03_samba \
@@ -37,6 +37,7 @@ EXTRA_OECONF='--disable-cups \
               --with-mandir=${mandir} \
               --with-swatdir=${datadir}/swat \
               --with-aio-support \
+              --without-libtalloc \
               samba_cv_struct_timespec=yes \
               libreplace_cv_HAVE_MMAP=${SAMBAMMAP}'
 
recipes/samba/samba_3.2.15.bb +1 -1
index 3f535b6..ef2707e 100644
@@ -9,7 +9,7 @@ SRC_URI += "file://configure-3.2.8.patch \
 SRC_URI[md5sum] = "5a3bcc4927c9643b9f42970d0815b18f"
 SRC_URI[sha256sum] = "84281fd1faeffee8558e49dff865dd382abbf78bc1be00f8cb5aa70aeea67d46"
 
-PR = "r2"
+PR = "r3"
 
 EXTRA_OECONF += "\
 	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
Signature · 1 line
1.7.3.4
#1 lore raw

PATCH 1/2 talloc: install .so links

In reply to Martin Jansa

* otherwise mesa finds talloc.pc, but doesn't link to libtalloc.so.2 in the end

---
 recipes/talloc/talloc_2.0.1.bb |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
recipes/talloc/talloc_2.0.1.bb +9 -0
index 9514a15..80f4b37 100644
@@ -10,8 +10,17 @@ SRC_URI[sha256sum] = "5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
+PR = "r1"
+
 # autoreconf doesn't work well while reconfiguring included libreplace
 do_configure () {
        gnu-configize
        oe_runconf
 }
+
+do_install_append() {
+       install -d ${D}${libdir}
+       ln -s libtalloc.so.2.0.1 ${D}${libdir}/libtalloc.so.2.0
+       ln -s libtalloc.so.2.0 ${D}${libdir}/libtalloc.so.2
+       ln -s libtalloc.so.2 ${D}${libdir}/libtalloc.so
+}
Signature · 1 line
1.7.3.4
#5 lore raw
In reply to Martin Jansa
Quoted 31 lines · Martin Jansa

On 2010-10-20 I've pushed newer mesa-7.9
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=30a3ea891d4511059a51882674f33aff2dddb96e
which depends on talloc
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=fabce288e40037d28c70f0f034185176f85e8664
and separate talloc recipe (because building whole samba just to provide talloc for mesa seems wrong and samba produced ICE before khem's fix)
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=afce52663d6b5b79c097136fa794dd3f76a4afff

Today I noticed, that usr/lib/pkgconfig/talloc.pc from talloc recipe was enough for mesa to compile, but because there was no libtalloc.so link it wasn't used in the end (as ldd confirms).

so talloc stages:
bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.*

(quoted diff) +0 -2
-rwxr-xr-x 1 bitbake bitbake  32K Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.a
-rwxr-xr-x 1 bitbake bitbake  73K Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so.2.0.1

bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/pkgconfig/talloc.pc -rw-r--r-- 1 bitbake bitbake 251 Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/pkgconfig/talloc.pc

samba adds:
bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.*
lrwxrwxrwx 1 bitbake bitbake 14 Dec 14 13:33 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so -> libtalloc.so.1
-rwxr-xr-x 1 bitbake bitbake 123K Dec 14 13:33 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so.1

now for sure I don't want to install whole samba on target (just for libtalloc) so I have few options

1) fix talloc to install libtalloc.so -> libtalloc.so.2.0.1 (conflicts with samba in sysroot) 2a) move libtalloc to separate package in samba recipe and make mesa depending on samba 2b) move libtalloc to separate package in samba recipe in case someone builds
it before mesa, but still depend only on fixed talloc
3) fix talloc + force samba build to use already installed libtalloc instead of building own version

Quoted 6 lines

Option 3) looks best, but I'm not sure how tightly samba depends on talloc and don't have time to test all samba versions we currently have (3.0.23c, 3.0.34, 3.2.15, 3.3.0, 3.3.9, 3.5.6), so 2b) looks as easier fix.

CCed 2 samba maintainers (wrt MAINTAINERS file) or if there is someone who cares about samba
recipes: can you clean recipes/samba a bit and provide some feedback on talloc issue?

I think its the same problem as described here
http://lists-archives.org/samba/39218-re-re-libtalloc-on-samba-3-2-0.html

I think disabling the use of shared libs would be an ok solutions to. Try that out.

Quoted 10 lines

Regards,

Signature · 6 lines
Martin 'JaMa' Jansa     jabber: [email protected]

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Acked-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] samba: use external talloc instead of building own

In reply to Martin Jansa

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 32 lines · Martin Jansa

* libtalloc now conflicts with libtalloc from talloc recipe
* tested only with samba-3.2.15

---
 recipes/samba/samba.inc       |    3 ++-
 recipes/samba/samba_3.2.15.bb |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
recipes/samba/samba.inc +2 -1
index a95106d..e5fa06e 100644
@@ -1,6 +1,6 @@
 SECTION = "console/network"
 LICENSE = "GPL"
-DEPENDS = "readline virtual/libiconv"
+DEPENDS = "readline virtual/libiconv talloc"
 
 SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
            file://volatiles.03_samba \
@@ -37,6 +37,7 @@ EXTRA_OECONF='--disable-cups \
               --with-mandir=${mandir} \
               --with-swatdir=${datadir}/swat \
               --with-aio-support \
+              --without-libtalloc \
               samba_cv_struct_timespec=yes \
               libreplace_cv_HAVE_MMAP=${SAMBAMMAP}'
 
recipes/samba/samba_3.2.15.bb +0 -0
index 3f535b6..ef2707e 100644

recipes/samba/samba_3.2.15.bb SRC_URI += "file://configure-3.2.8.patch \ · line 15

Quoted 8 lines
recipes/samba/samba_3.2.15.bb +1 -1
@@ -9,7 +9,7 @@ SRC_URI += "file://configure-3.2.8.patch \
 SRC_URI[md5sum] = "5a3bcc4927c9643b9f42970d0815b18f"
 SRC_URI[sha256sum] = "84281fd1faeffee8558e49dff865dd382abbf78bc1be00f8cb5aa70aeea67d46"
 
-PR = "r2"
+PR = "r3"
 
 EXTRA_OECONF += "\
 	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNENUhMkyGM64RGpERAlOOAJ9y27X2rICdmXw/uija6QDTyFEzyQCeMcac wsIjyIKY6gnmpIbwvh9qjrw=
=8Xom
-----END PGP SIGNATURE-----

Acked-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] talloc: install .so links

In reply to Martin Jansa

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 17 lines · Martin Jansa

* otherwise mesa finds talloc.pc, but doesn't link to libtalloc.so.2 in the end

---
 recipes/talloc/talloc_2.0.1.bb |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
recipes/talloc/talloc_2.0.1.bb +2 -0
index 9514a15..80f4b37 100644
@@ -10,8 +10,17 @@ SRC_URI[sha256sum] = "5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
+PR = "r1"
+
 # autoreconf doesn't work well while reconfiguring included libreplace
 do_configure () {

recipes/talloc/talloc_2.0.1.bb SRC_URI[sha256sum] = "5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd · line 26

Quoted 10 lines
recipes/talloc/talloc_2.0.1.bb +7 -0
        gnu-configize
        oe_runconf
 }
+
+do_install_append() {
+       install -d ${D}${libdir}
+       ln -s libtalloc.so.2.0.1 ${D}${libdir}/libtalloc.so.2.0
+       ln -s libtalloc.so.2.0 ${D}${libdir}/libtalloc.so.2
+       ln -s libtalloc.so.2 ${D}${libdir}/libtalloc.so
+}

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNENUYMkyGM64RGpERAipoAJwO7iq3HesWj8x9o4vnW3v2aNEirACgvDn9 QaeCjBOjMtbmsD1cd+T+1P0=
=Vb7w
-----END PGP SIGNATURE-----

#6 lore raw
In reply to Khem Raj
Quoted 36 lines · Khem Raj
Quoted 35 lines · Martin Jansa

On 2010-10-20 I've pushed newer mesa-7.9
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=30a3ea891d4511059a51882674f33aff2dddb96e
which depends on talloc
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=fabce288e40037d28c70f0f034185176f85e8664
and separate talloc recipe (because building whole samba just to provide talloc for mesa seems wrong and samba produced ICE before khem's fix)
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=afce52663d6b5b79c097136fa794dd3f76a4afff

Today I noticed, that usr/lib/pkgconfig/talloc.pc from talloc recipe was enough for mesa to compile, but because there was no libtalloc.so link it wasn't used in the end (as ldd confirms).

so talloc stages:
bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.*

(quoted diff) +0 -2
-rwxr-xr-x 1 bitbake bitbake  32K Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.a
-rwxr-xr-x 1 bitbake bitbake  73K Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so.2.0.1

bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/pkgconfig/talloc.pc -rw-r--r-- 1 bitbake bitbake 251 Dec 21 13:30 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/pkgconfig/talloc.pc

samba adds:
bitbake@jama ~ $ ll tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.*
lrwxrwxrwx 1 bitbake bitbake 14 Dec 14 13:33 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so -> libtalloc.so.1
-rwxr-xr-x 1 bitbake bitbake 123K Dec 14 13:33 tmpdir-shr/sysroots/armv4t-oe-linux-gnueabi/usr/lib/libtalloc.so.1

now for sure I don't want to install whole samba on target (just for libtalloc) so I have few options

1) fix talloc to install libtalloc.so -> libtalloc.so.2.0.1 (conflicts with samba in sysroot) 2a) move libtalloc to separate package in samba recipe and make mesa depending on samba 2b) move libtalloc to separate package in samba recipe in case someone builds
it before mesa, but still depend only on fixed talloc
3) fix talloc + force samba build to use already installed libtalloc instead of building own version

Option 3) looks best, but I'm not sure how tightly samba depends on talloc and don't have time to test all samba versions we currently have (3.0.23c, 3.0.34, 3.2.15, 3.3.0, 3.3.9, 3.5.6), so 2b) looks as easier fix.

Quoted 8 lines
Quoted 2 lines

CCed 2 samba maintainers (wrt MAINTAINERS file) or if there is someone who cares about samba
recipes: can you clean recipes/samba a bit and provide some feedback on talloc issue?

I think its the same problem as described here
http://lists-archives.org/samba/39218-re-re-libtalloc-on-samba-3-2-0.html

I think disabling the use of shared libs would be an ok solutions to. Try that out.

Hi,

after reading
http://lists.freedesktop.org/archives/mesa-dev/2010-August/002523.html
and checking how is this solved in gentoo, I have tried Option 3) (see resulting 2 patches sent here)

and resulting /usr/sbin/smbd is not linked to libtalloc (--without-talloc seems enough).

Regards,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]