baryon updates
cover baryon updates
This patch set contains a change which will not work with versions of poky prior to commit 51cbb5ae76a22d465e2f6c5ef923ec2682624e3b, and therefor should not be applied until after cutting a danny branch.
The following changes since commit 9a80f62b1874bbb0819068cf394e9fd920bb84b7:
proftpd: conditionally remove /usr/libexec (2012-12-05 16:27:36 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib strassek/baryon-updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=strassek/baryon-updates
Kevin Strasser (4):
webmin: remove perl-module-warnings-register RDEPENDS
ffmpeg: build position independent code where possible
baryon-image: use parted instead of util-linux
schroedinger: specify the version of MPL in use
recipes-extended/images/baryon-image.bb | 2 +- recipes-extended/webmin/webmin_1.590.bb | 4 ++-- recipes-multimedia/ffmpeg/ffmpeg_0.6.1.bb | 3 ++- recipes-multimedia/schroedinger/schroedinger.inc | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/4 webmin: remove perl-module-warnings-register RDEPENDS
As of poky commit 51cbb5ae76a22d465e2f6c5ef923ec2682624e3b, the module is included by default and an error is produced if requested.
Fixes [YOCTO #3530]
--- recipes-extended/webmin/webmin_1.590.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-extended/webmin/webmin_1.590.bb +2 -2
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=0373ac9f611e542ddebe1ec6394afc3c" # FIXME: some of this should be figured out automatically RDEPENDS_${PN} += "perl perl-module-socket perl-module-exporter perl-module-exporter-heavy perl-module-carp perl-module-strict" -RDEPENDS_${PN} += "perl-module-warnings perl-module-warnings-register perl-module-xsloader perl-module-posix perl-module-autoloader" +RDEPENDS_${PN} += "perl-module-warnings perl-module-xsloader perl-module-posix perl-module-autoloader" RDEPENDS_${PN} += "perl-module-fcntl perl-module-tie-hash perl-module-vars perl-module-time-local perl-module-config perl-module-constant" RDEPENDS_${PN} += "perl-module-file perl-module-file-glob perl-module-file-copy perl-module-sdbm perl-module-sdbm-file perl-module-timelocal perl-module-feature" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ file://setup.sh \
Signature · 1 line
1.7.9.5
PATCH 2/4 ffmpeg: build position independent code where possible
Fixes several of the textrel warnings the package has been producing.
--- recipes-multimedia/ffmpeg/ffmpeg_0.6.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
recipes-multimedia/ffmpeg/ffmpeg_0.6.1.bb +2 -1
@@ -2,7 +2,7 @@ require ffmpeg.inc LICENSE = "LGPLv2.1+ & GPLv2+" DEPENDS += "schroedinger libgsm" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI = "http://ffmpeg.org/releases/ffmpeg-${PV}.tar.bz2" SRC_URI[md5sum] = "4f5d732d25eedfb072251b5314ba2093"
@@ -28,6 +28,7 @@ EXTRA_OECONF = " \ --enable-pthreads \ --enable-shared \ --enable-swscale \ + --enable-pic \ --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ --extra-ldflags="${TARGET_LDFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ --prefix=${prefix}/ \
Signature · 1 line
1.7.9.5
PATCH 3/4 baryon-image: use parted instead of util-linux
In reply to Kevin Strasserutil-linux replaces the 'reset' command provided by busybox with a script that uses 'tset', which fails because it isn't installed.
--- recipes-extended/images/baryon-image.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-extended/images/baryon-image.bb +1 -1
@@ -2,7 +2,7 @@ IMAGE_FEATURES = "nfs-server package-management ssh-server-dropbear debug-tweaks inherit core-image -IMAGE_INSTALL += "samba procps mdadm e2fsprogs-mke2fs util-linux \ +IMAGE_INSTALL += "samba procps mdadm e2fsprogs-mke2fs parted \ webmin \ webmin-module-status \ webmin-module-proc \
Signature · 1 line
1.7.9.5
PATCH 4/4 schroedinger: specify the version of MPL in use
In reply to Kevin Strasser--- recipes-multimedia/schroedinger/schroedinger.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-multimedia/schroedinger/schroedinger.inc +1 -1
@@ -1,5 +1,5 @@ HOMEPAGE = "http://schrodinger.sourceforge.net/" -LICENSE = "MPL GPLv2 LGPLv2 MIT" +LICENSE = "MPL-1.1 GPLv2 LGPLv2 MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d91a46405fc074b88c963cc4f2a0aae9 \ file://COPYING.GPL;md5=e181e3b7c66f5f96921d813c1074f833 \ file://COPYING.LGPL;md5=38c893e21baec4cd75ad800ba9e2410a \
Signature · 1 line
1.7.9.5
Quoted 21 lines · On Monday 07 January 2013 13:05:37 Kevin Strasser wrote:
This patch set contains a change which will not work with versions of poky prior to commit
51cbb5ae76a22d465e2f6c5ef923ec2682624e3b, and therefor should not be applied until after cutting a danny branch.The following changes since commit
9a80f62b1874bbb0819068cf394e9fd920bb84b7:proftpd: conditionally remove
/usr/libexec(2012-12-05 16:27:36 +0000)are available in the git repository at:
git://git.yoctoproject.org/poky-contribstrassek/baryon-updateshttp://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=strassek/baryon-up
datesKevin Strasser (4):
webmin: remove perl-module-warnings-register RDEPENDS
ffmpeg: build position independent code where possible
baryon-image: use parted instead of util-linux
schroedinger: specify the version of MPL in use
Quoted 5 lines
recipes-extended/images/baryon-image.bb | 2 +- recipes-extended/webmin/webmin_1.590.bb | 4 ++-- recipes-multimedia/ffmpeg/ffmpeg_0.6.1.bb | 3 ++- recipes-multimedia/schroedinger/schroedinger.inc | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-)
I've merged these, and created a danny branch which excludes the perl-module- warnings-register patch.
Thanks,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre