Some fixes for issues preventing successful builds with master and edison. It includes a sync of the samba recipe with the current version in meta-oe - it's still not completely in sync, hopefully that can be done as a separate exercise in the near future. The following changes since commit 1784e3a18f8e5b56568d971fcce0521172007f90: meta-baryon: update proftpd SRC_URI (2012-07-10 18:37:44 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib paule/baryon-fixes1 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/baryon-fixes1 Paul Eggleton (4): faad2: split out staticdev files faac: split out staticdev files samba: merge with meta-oe baryon-image: use IMAGE_INSTALL instead of CORE_IMAGE_EXTRA_INSTALL recipes-connectivity/samba/samba-basic.inc | 12 ++++-------- recipes-connectivity/samba/samba_3.5.6.bb | 18 +++++++----------- recipes-extended/images/baryon-image.bb | 5 +++-- recipes-multimedia/faac/faac_1.24.bb | 5 +++-- recipes-multimedia/faad2/faad2_2.7.bb | 10 ++++++---- 5 files changed, 23 insertions(+), 27 deletions(-) -- 1.7.9.5
Fixes the following QA issues: ERROR: QA Issue: non -staticdev package contains static .a library: libfaad-dev path '${WORKDIR}/packages-split/libfaad-dev/usr/lib/libfaad.a' ERROR: QA Issue: non -staticdev package contains static .a library: libmp4ff-dev path '${WORKDIR}/packages-split/libmp4ff-dev/usr/lib/libmp4ff.a' Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- recipes-multimedia/faad2/faad2_2.7.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/recipes-multimedia/faad2/faad2_2.7.bb b/recipes-multimedia/faad2/faad2_2.7.bb index 33e1743..e9fb8f6 100644 --- a/recipes-multimedia/faad2/faad2_2.7.bb +++ b/recipes-multimedia/faad2/faad2_2.7.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=381c8cbe277a7bc1ee2ae6083a04c958 \ file://README;beginline=19;endline=40;md5=79929d64a69b0588ba8445f6eea56913" PRIORITY = "optional" -PR = "r1" +PR = "r2" inherit autotools @@ -15,13 +15,15 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/faac/faad2-src/faad2-${PV}/${PN}-${PV}.tar.bz2; SRC_URI[faad2.md5sum] = "4c332fa23febc0e4648064685a3d4332" SRC_URI[faad2.sha256sum] = "14561b5d6bc457e825bfd3921ae50a6648f377a9396eaf16d4b057b39a3f63b5" -PACKAGES =+ "libfaad libfaad-dev libmp4ff libmp4ff-dev" +PACKAGES =+ "libfaad libfaad-dev libfaad-staticdev libmp4ff libmp4ff-dev libmp4ff-staticdev" FILES_${PN} = "${bindir}/faad" FILES_libfaad = "${libdir}/libfaad.so.*" -FILES_libfaad-dev = "${libdir}/libfaad.so ${libdir}/libfaad.la ${libdir}/libfaad.a ${includedir}/faad.h" +FILES_libfaad-dev = "${libdir}/libfaad.so ${libdir}/libfaad.la ${includedir}/faad.h" +FILES_libfaad-staticdev = "${libdir}/libfaad.a" FILES_libmp4ff = "${libdir}/libmp4ff.so.*" -FILES_libmp4ff-dev = "${libdir}/libmp4ff.so ${libdir}/libmp4ff.la ${libdir}/libmp4ff.a ${includedir}/mp4ff.h" +FILES_libmp4ff-dev = "${libdir}/libmp4ff.so ${libdir}/libmp4ff.la ${includedir}/mp4ff.h" +FILES_libmp4ff-staticdev = "${libdir}/libmp4ff.a" -- 1.7.9.5
Fixes the following QA issue: ERROR: QA Issue: non -staticdev package contains static .a library: libfaac-dev path '${WORKDIR}/packages-split/libfaac-dev/usr/lib/libfaac.a' Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- recipes-multimedia/faac/faac_1.24.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes-multimedia/faac/faac_1.24.bb b/recipes-multimedia/faac/faac_1.24.bb index b862ad0..fc403ac 100644 --- a/recipes-multimedia/faac/faac_1.24.bb +++ b/recipes-multimedia/faac/faac_1.24.bb @@ -6,7 +6,7 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://libfaac/coder.h;beginline=5;endline=17;md5=fa1fd6a5fa8cdc877d63a12530d273e0" -PR = "r2" +PR = "r3" inherit autotools @@ -17,7 +17,8 @@ PACKAGES =+ "lib${PN} lib${PN}-dev" FILES_${PN} = " ${bindir}/faac " FILES_lib${PN} = " ${libdir}/libfaac.so.*" -FILES_lib${PN}-dev = " ${includedir}/faac.h ${includedir}/faaccfg.h ${libdir}/libfaac.so ${libdir}/libfaac.la ${libdir}/libfaac.a " +FILES_lib${PN}-dev = "${includedir}/faac.h ${includedir}/faaccfg.h ${libdir}/libfaac.so ${libdir}/libfaac.la" +FILES_lib${PN}-staticdev = "${libdir}/libfaac.a" SRC_URI[md5sum] = "e72dc74db17b42b06155613489077ad7" -- 1.7.9.5
Merge this recipe with the current version from meta-oe. This brings the following improvements: * Fix a configure failure due to python host contamination * Split some components out to their own packages * Tidy up some cruft left over from the OE-Classic recipe Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- recipes-connectivity/samba/samba-basic.inc | 12 ++++-------- recipes-connectivity/samba/samba_3.5.6.bb | 18 +++++++----------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/recipes-connectivity/samba/samba-basic.inc b/recipes-connectivity/samba/samba-basic.inc index 362762a..f0a9bd7 100644 --- a/recipes-connectivity/samba/samba-basic.inc +++ b/recipes-connectivity/samba/samba-basic.inc @@ -8,15 +8,11 @@ EXTRA_OECONF += "\ --without-ldap \ --without-krb5" -PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc swat" - -RCONFLICTS_${PN} = "samba-ads" -RCONFLICTS_libsmbclient = "libsmbclient-ads" -RCONFLICTS_libsmbclient-dev = "libsmbclient-ads-dev" -RCONFLICTS_cifs = "cifs-ads" -RCONFLICTS_cifs-doc = "cifs-ads-doc" -RCONFLICTS_swat = "swat-ads" +PACKAGES =+ "libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev cifs cifs-doc swat" +FILES_libnetapi = "${libdir}/libnetapi.so.*" +FILES_libsmbsharemodes = "${libdir}/libsmbsharemodes.so.*" +FILES_libtdb = "${libdir}/libtdb.so.*" FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs" FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8" FILES_libsmbclient = "${libdir}/libsmbclient.so.*" diff --git a/recipes-connectivity/samba/samba_3.5.6.bb b/recipes-connectivity/samba/samba_3.5.6.bb index a76eabb..6b617ef 100644 --- a/recipes-connectivity/samba/samba_3.5.6.bb +++ b/recipes-connectivity/samba/samba_3.5.6.bb @@ -3,20 +3,19 @@ require samba-basic.inc LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504" -S = "${WORKDIR}/samba-${PV}/source3" - -# 3.3.0 and newer will upgrade your tdb database to a -# new version that you can not downgrade to use with older -# releases. More testing will happen before this is removed -# should there be further issues. Appears to work though :) -DEFAULT_PREFERENCE = "-1" +PR = "r1" SRC_URI += "file://config-h.patch \ file://tdbheaderfix.patch;patchdir=.." -PR = "r0" +SRC_URI[md5sum] = "bf6c09ea497a166df8bd672db1d8da8f" +SRC_URI[sha256sum] = "466410868375d19a286ac3fc5d9f3c267ce359189f8e0d76e72ec10bd54247da" + +S = "${WORKDIR}/samba-${PV}/source3" EXTRA_OECONF += "\ + ac_cv_path_PYTHON=/not/exist \ + ac_cv_path_PYTHON_CONFIG=/not/exist \ SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \ linux_getgrouplist_ok=no \ @@ -36,9 +35,6 @@ do_compile () { base_do_compile } -SRC_URI[md5sum] = "bf6c09ea497a166df8bd672db1d8da8f" -SRC_URI[sha256sum] = "466410868375d19a286ac3fc5d9f3c267ce359189f8e0d76e72ec10bd54247da" - pkg_postinst_${PN} () { if [ "x$D" != "x" ] ; then exit 1 -- 1.7.9.5
CORE_IMAGE_EXTRA_INSTALL is really intended to be used from local.conf and not in custom image recipes, so we should not be using it here. As a bonus, adding to IMAGE_INSTALL instead allows the image recipe to be compatible with the edison release. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- recipes-extended/images/baryon-image.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes-extended/images/baryon-image.bb b/recipes-extended/images/baryon-image.bb index 663c80d..dc6b197 100644 --- a/recipes-extended/images/baryon-image.bb +++ b/recipes-extended/images/baryon-image.bb @@ -1,6 +1,8 @@ IMAGE_FEATURES = "nfs-server package-management ssh-server-dropbear debug-tweaks" -CORE_IMAGE_EXTRA_INSTALL = "samba procps mdadm e2fsprogs-mke2fs util-linux \ +inherit core-image + +IMAGE_INSTALL += "samba procps mdadm e2fsprogs-mke2fs util-linux \ webmin \ webmin-module-status \ webmin-module-proc \ @@ -23,4 +25,3 @@ CORE_IMAGE_EXTRA_INSTALL = "samba procps mdadm e2fsprogs-mke2fs util-linux \ mediatomb \ proftpd" -inherit core-image -- 1.7.9.5
On Wednesday 11 July 2012 18:51:56 Paul Eggleton wrote:
> Some fixes for issues preventing successful builds with master and
> edison. It includes a sync of the samba recipe with the current version
> in meta-oe - it's still not completely in sync, hopefully that can be
> done as a separate exercise in the near future.
>
>
> The following changes since commit 1784e3a18f8e5b56568d971fcce0521172007f90:
>
> meta-baryon: update proftpd SRC_URI (2012-07-10 18:37:44 +0100)
>
> are available in the git repository at:
>
> git://git.yoctoproject.org/poky-contrib paule/baryon-fixes1
>
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/baryon-fixes
> 1
>
> Paul Eggleton (4):
> faad2: split out staticdev files
> faac: split out staticdev files
> samba: merge with meta-oe
> baryon-image: use IMAGE_INSTALL instead of CORE_IMAGE_EXTRA_INSTALL
>
> recipes-connectivity/samba/samba-basic.inc | 12 ++++--------
> recipes-connectivity/samba/samba_3.5.6.bb | 18 +++++++-----------
> recipes-extended/images/baryon-image.bb | 5 +++--
> recipes-multimedia/faac/faac_1.24.bb | 5 +++--
> recipes-multimedia/faad2/faad2_2.7.bb | 10 ++++++----
> 5 files changed, 23 insertions(+), 27 deletions(-)
I've merged these along with a trivial patch to remove PRIORITY from all
recipes that still had it.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre