Pending patches done by O.S. Systems before using oe-core
Hello,
I do believe those patches are useful and then I am resending them up to date against current dev tip. Please review and merge them as you wish.
PATCH 1/17 udev (165): move ConsoleKit support to udev-consolekit package
--- recipes/udev/udev_165.bb | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
recipes/udev/udev_165.bb +3 -2
@@ -71,7 +71,7 @@ EXTRA_OECONF += " --with-udev-prefix= \ INITSCRIPT_NAME = "udev" INITSCRIPT_PARAMS = "start 04 S ." -PACKAGES =+ "libudev libgudev udev-utils" +PACKAGES =+ "libudev libgudev udev-utils udev-consolekit" FILES_libudev = "${base_libdir}/libudev.so.*" FILES_libgudev = "${base_libdir}/libgudev*.so.*"
@@ -84,7 +84,8 @@ FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" # udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir} # is ${prefix}/lib64 -FILES_${PN} += "/lib/udev* ${libdir}/ConsoleKit" +FILES_${PN} += "/lib/udev*" +FILES_${PN}-consolekit += "${libdir}/ConsoleKit" FILES_${PN}-dbg += "/lib/udev/.debug" # Package up systemd files
Signature · 1 line
1.7.1
PATCH 2/17 conf/bitbake: improve compression image handling
In reply to Otavio Salvador * add GZIP_COMPRESSION_LEVEL
* add BZIP2_COMPRESSION_LEVEL
* use xz-native to generate lzma images
--- conf/bitbake.conf | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-)
conf/bitbake.conf +12 -10
@@ -150,6 +150,8 @@ QEMU_OPTIONS_armv7a = "-cpu cortex-a8" # default compression levels XZ_COMPRESSION_LEVEL ?= "-e -9" LZMA_COMPRESSION_LEVEL ?= "-e -9" +GZIP_COMPRESSION_LEVEL ?= "-9" +BZIP2_COMPRESSION_LEVEL ?= "-9" # default integrity check XZ_INTEGRITY_CHECK ?= "crc32"
@@ -384,14 +386,14 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --faketime --output= IMAGE_CMD_yaffs2 = "mkyaffs2image ${EXTRA_IMAGECMD} ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.yaffs2" IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2 = "genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" -IMAGE_CMD_ext2.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz" -IMAGE_CMD_ext2.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext2.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.bz2" +IMAGE_CMD_ext2.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f ${GZIP_COMPRESSION_LEVEL} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz" +IMAGE_CMD_ext2.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; bzip2 -f ${BZIP2_COMPRESSION_LEVEL} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext2.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.bz2" IMAGE_CMD_ext3 = "genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" -IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz" -IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.bz2" +IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f ${GZIP_COMPRESSION_LEVEL} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz" +IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; bzip2 -f ${BZIP2_COMPRESSION_LEVEL} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.bz2" IMAGE_CMD_ext4 = "genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac;" -IMAGE_CMD_ext4.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; set +e;e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz" -IMAGE_CMD_ext4.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.bz2" +IMAGE_CMD_ext4.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; set +e;e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; gzip -f ${GZIP_COMPRESSION_LEVEL} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz" +IMAGE_CMD_ext4.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; bzip2 -f ${BZIP2_COMPRESSION_LEVEL} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.bz2" IMAGE_CMD_ext4.xz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.xz; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; xz -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.xz ; rm -f ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ; rmdir ${DEPLOY_DIR_IMAGE}/tmp.xz" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
@@ -401,10 +403,10 @@ IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_ IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." IMAGE_CMD_tar.xz = "cd ${IMAGE_ROOTFS} && tar --xz -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.xz ." IMAGE_CMD_cpio = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) ${EXTRA_IMAGECMD}" -IMAGE_CMD_cpio.gz = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz) ${EXTRA_IMAGECMD}" +IMAGE_CMD_cpio.gz = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c ${GZIP_COMPRESSION_LEVEL} >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz) ${EXTRA_IMAGECMD}" IMAGE_CMD_cpio.xz = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | xz -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.xz) ${EXTRA_IMAGECMD}" -IMAGE_CMD_cpio.gz.u-boot = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz) ${EXTRA_IMAGECMD}; mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C gzip -n ${IMAGE_NAME} -d ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz.u-boot" -IMAGE_CMD_cpio.lzma = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | lzma -c ${LZMA_COMPRESSION_LEVEL} >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.lzma) ${EXTRA_IMAGECMD}" +IMAGE_CMD_cpio.gz.u-boot = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c ${GZIP_COMPRESSION_LEVEL} >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz) ${EXTRA_IMAGECMD}; mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C gzip -n ${IMAGE_NAME} -d ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz.u-boot" +IMAGE_CMD_cpio.lzma = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | xz --format=lzma -c ${LZMA_COMPRESSION_LEVEL} >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.lzma) ${EXTRA_IMAGECMD}" IMAGE_CMD_ubi = "echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=${UBI_VOLNAME} >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg" IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS}"
@@ -435,7 +437,7 @@ IMAGE_DEPENDS_ext4.gz = "genext2fs-native e2fsprogs-native" IMAGE_DEPENDS_ext4.bz2 = "genext2fs-native e2fsprogs-native" IMAGE_DEPENDS_ext4.xz = "genext2fs-native e2fsprogs-native xz-native" IMAGE_DEPENDS_cpio.gz.u-boot = "u-boot-mkimage-native" -IMAGE_DEPENDS_cpio.lzma = "lzma-native" +IMAGE_DEPENDS_cpio.lzma = "xz-native" IMAGE_DEPENDS_cpio.xz = "xz-native" IMAGE_DEPENDS_squashfs = "squashfs-tools-native" IMAGE_DEPENDS_squashfs-lzma = "squashfs-tools-native"
Signature · 1 line
1.7.1
Re: [PATCH 02/17] conf/bitbake: improve compression image handling
conf/bitbake.conf QEMU_OPTIONS_armv7a = "-cpu cortex-a8" · line 154
Quoted 10 lines · Otavio Salvador
conf/bitbake.conf +2
-0@@ -150,6 +150,8 @@ QEMU_OPTIONS_armv7a = "-cpu cortex-a8" # default compression levels XZ_COMPRESSION_LEVEL ?= "-e -9" LZMA_COMPRESSION_LEVEL ?= "-e -9" +GZIP_COMPRESSION_LEVEL ?= "-9" +BZIP2_COMPRESSION_LEVEL ?= "-9"
We had some discussion of this patch last time you posted it, and I thought the outcome was that you were going to put these bits someplace other than bitbake.conf. Am I remembering that wrong?
p.
Re: [PATCH 02/17] conf/bitbake: improve compression image handling
Quoted 15 lines · Phil Blundell
conf/bitbake.conf QEMU_OPTIONS_armv7a = "-cpu cortex-a8" · line 154
Quoted 10 lines · Otavio Salvador
conf/bitbake.conf +0
-0@@ -150,6 +150,8 @@ QEMU_OPTIONS_armv7a = "-cpu cortex-a8" # default compression levelsXZ_COMPRESSION_LEVEL ?= "-e -9"
LZMA_COMPRESSION_LEVEL ?= "-e -9"conf/bitbake.conf +2
-0+GZIP_COMPRESSION_LEVEL ?= "-9" +BZIP2_COMPRESSION_LEVEL ?= "-9"We had some discussion of this patch last time you posted it, and I thought the outcome was that you were going to put these bits someplace other than bitbake.conf. Am I remembering that wrong?
You're not wrong but I'm not focused on regular OE since we're moving to OE-core and thus I just resent those so someone could pick those and merge if fill they're useful.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
PATCH 3/17 xorg-xserver-common.inc: drop .la files from packages
In reply to Otavio Salvador--- recipes/xorg-xserver/xorg-xserver-common.inc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
recipes/xorg-xserver/xorg-xserver-common.inc +1 -0
@@ -108,4 +108,5 @@ FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" do_install_append () { ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts + find ${D}/${libdir} -name '*.la' -exec rm '{}' ';' }
Signature · 1 line
1.7.1
PATCH 4/17 xserver-xorg (1.9.4): enable xephyr
In reply to Otavio Salvador--- recipes/xorg-xserver/xserver-xorg_1.9.4.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
recipes/xorg-xserver/xserver-xorg_1.9.4.bb +2 -2
@@ -6,7 +6,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native" PE = "2" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI += " \ file://dolt-fix.patch \
@@ -25,7 +25,7 @@ do_install_prepend() { PACKAGE_ARCH_ion = "${MACHINE_ARCH}" XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}" -EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs" export LDFLAGS += " -ldl "
Signature · 1 line
1.7.1
PATCH 5/17 xserver-xorg (1.10.0.902): enable xephyr
In reply to Otavio Salvador--- recipes/xorg-xserver/xserver-xorg_git.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
recipes/xorg-xserver/xserver-xorg_git.bb +2 -2
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00" DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native" PV = "1.10.0.902" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" PR_append = "+gitr${SRCPV}" PE = "2"
@@ -32,7 +32,7 @@ do_install_prepend() { PACKAGE_ARCH_ion = "${MACHINE_ARCH}" XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}" -EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs" export LDFLAGS += " -ldl "
Signature · 1 line
1.7.1
Re: [PATCH 05/17] xserver-xorg (1.10.0.902): enable xephyr
Quoted 18 lines · Otavio Salvador
--- recipes/xorg-xserver/xserver-xorg_git.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)recipes/xorg-xserver/xserver-xorg_git.bb +1
-1@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00" DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native" PV = "1.10.0.902" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" PR_append = "+gitr${SRCPV}" PE = "2"
recipes/xorg-xserver/xserver-xorg_git.bb do_install_prepend() { · line 35
Quoted 5 lines
recipes/xorg-xserver/xserver-xorg_git.bb +1
-1@@ -32,7 +32,7 @@ do_install_prepend() { PACKAGE_ARCH_ion = "${MACHINE_ARCH}" XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}" -EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
as reported on IRC I still get ICE with gcc-4.5 from OE, with gcc-4.6 from meta-oe it builds fine. So I've enabled it only for meta-oe and will push it with 1.10.2 after more tests.
Cheers,
Quoted 11 lines
recipes/xorg-xserver/xserver-xorg_git.bb +0
-0EXTRA_OECONF += " --enable-dri2 --disable-unit-tests --disable-docs --disable-devel-docs" export LDFLAGS += " -ldl "Signature · 7 lines
1.7.1 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
PATCH 6/17 freerdp: update version to 2009-03-29 snapshot
In reply to Otavio Salvador* drop singleton-mode.patch, merged upstream;
--- recipes/freerdp/freerdp/singleton-mode.patch | 208 -------------------------- recipes/freerdp/freerdp_git.bb | 7 +- 2 files changed, 3 insertions(+), 212 deletions(-) delete mode 100644 recipes/freerdp/freerdp/singleton-mode.patch
recipes/freerdp/freerdp/singleton-mode.patch deleted +0 -208
@@ -1,208 +0,0 @@ -From dd81b7b7902015d35e48117db7fb664aa75fdf62 Mon Sep 17 00:00:00 2001 -From: Eduardo Beloni <[email protected]> -Date: Thu, 3 Mar 2011 14:41:32 -0300 -Subject: [PATCH] xfreerdp: singleton mode - -Allows return code according to the Set Error Info PDU ---- - X11/xf_types.h | 21 +++++++++++++++++++++ - X11/xfreerdp.c | 45 ++++++++++++++++++++++++++++++++++++--------- - doc/xfreerdp.1 | 4 ++++ - 3 files changed, 61 insertions(+), 9 deletions(-) - -diff --git a/X11/xf_types.h b/X11/xf_types.h -index 0d355e2..75c7d88 100644 ---- a/X11/xf_types.h -+++ b/X11/xf_types.h -@@ -88,6 +88,27 @@ struct xf_info - }; - typedef struct xf_info xfInfo; - -+ -+enum STANDARD_EXIT_CODE -+{ -+ EX_OK = 0, -+ EX_USAGE = 64, -+ EX_DATAERR = 65, -+ EX_NOINPUT = 66, -+ EX_NOUSER = 67, -+ EX_NOHOST = 68, -+ EX_UNAVAILABLE = 69, -+ EX_SOFTWARE = 70, -+ EX_OSERR = 71, -+ EX_OSFILE = 72, -+ EX_CANTCREAT = 73, -+ EX_IOERR = 74, -+ EX_TEMPFAIL = 75, -+ EX_PROTOCOL = 76, -+ EX_NOPERM = 77, -+ EX_CONFIG = 78, -+}; -+ - #ifdef WITH_DEBUG - #define DEBUG(fmt, ...) printf("DBG %s (%d): " fmt, __FUNCTION__, __LINE__, ## __VA_ARGS__) - #else -diff --git a/X11/xfreerdp.c b/X11/xfreerdp.c -index 994e8ee..f9236e7 100644 ---- a/X11/xfreerdp.c -+++ b/X11/xfreerdp.c -@@ -155,7 +155,7 @@ out_args(void) - - /* Returns "true" on errors or other reasons to not continue normal operation */ - static int --process_params(xfInfo * xfi, int argc, char ** argv, int * pindex) -+process_params(xfInfo * xfi, int argc, char ** argv, int * pindex, _Bool * singleton) - { - rdpSet * settings; - rdpKeyboardLayout * layouts; -@@ -165,6 +165,9 @@ process_params(xfInfo * xfi, int argc, char ** argv, int * pindex) - int i, j; - struct passwd * pw; - int num_extensions; -+ int first_index; -+ -+ first_index = *pindex; - - set_default_params(xfi); - settings = xfi->settings; -@@ -512,6 +515,16 @@ process_params(xfInfo * xfi, int argc, char ** argv, int * pindex) - } - num_extensions++; - } -+ else if (strcmp("--singleton", argv[*pindex]) == 0) -+ { -+ if (first_index != 1) /* this is not the first parse */ -+ { -+ printf("Parsing error: you can't run more than one thread in singleton mode\n"); -+ exit(EX_USAGE); -+ } -+ -+ *singleton = 1; -+ } - else if ((strcmp("-h", argv[*pindex]) == 0) || strcmp("--help", argv[*pindex]) == 0) - { - out_args(); -@@ -577,6 +590,7 @@ run_xfreerdp(xfInfo * xfi) - int max_sck; - fd_set rfds; - fd_set wfds; -+ uint32 disc_reason; - - /* create an instance of the library */ - inst = freerdp_new(xfi->settings); -@@ -611,7 +625,7 @@ run_xfreerdp(xfInfo * xfi) - if (inst->rdp_connect(inst) != 0) - { - printf("run_xfreerdp: inst->rdp_connect failed\n"); -- return 1; -+ return EX_PROTOCOL; - } - if (freerdp_chanman_post_connect(xfi->chan_man, inst) != 0) - { -@@ -687,7 +701,7 @@ run_xfreerdp(xfInfo * xfi) - /* check the libfreerdp fds */ - if (inst->rdp_check_fds(inst) != 0) - { -- printf("run_xfreerdp: inst->rdp_check_fds failed\n"); -+ printf("run_xfreerdp: inst->rdp_check_fds failed reason %u\n", inst->disc_reason); - break; - } - /* check x fds */ -@@ -703,21 +717,24 @@ run_xfreerdp(xfInfo * xfi) - break; - } - } -+ -+ disc_reason = inst->disc_reason; - /* cleanup */ - freerdp_chanman_close(xfi->chan_man, inst); - inst->rdp_disconnect(inst); - freerdp_free(inst); - xf_uninit(xfi); -- return 0; -+ return disc_reason; - } - - static void * - thread_func(void * arg) - { - xfInfo * xfi; -+ uint32 disc_reason; - - xfi = (xfInfo *) arg; -- run_xfreerdp(xfi); -+ disc_reason = run_xfreerdp(xfi); - free(xfi->settings); - freerdp_chanman_free(xfi->chan_man); - free(xfi); -@@ -728,7 +745,7 @@ thread_func(void * arg) - { - freerdp_sem_signal(&g_sem); - } -- return NULL; -+ return (void *)disc_reason; - } - - int -@@ -738,6 +755,8 @@ main(int argc, char ** argv) - xfInfo * xfi; - pthread_t thread; - int index = 1; -+ _Bool singleton = 0; -+ int disc_reason = 0; - - setlocale(LC_CTYPE, ""); - if (argc == 1) -@@ -760,7 +779,7 @@ main(int argc, char ** argv) - memset(xfi, 0, sizeof(xfInfo)); - xfi->settings = (rdpSet *) malloc(sizeof(rdpSet)); - xfi->chan_man = freerdp_chanman_new(); -- rv = process_params(xfi, argc, argv, &index); -+ rv = process_params(xfi, argc, argv, &index, &singleton); - if (rv) - { - free(xfi->settings); -@@ -776,9 +795,17 @@ main(int argc, char ** argv) - { - g_thread_count++; - } -+ -+ if (singleton) -+ break; - } - -- if (g_thread_count > 0) -+ if (singleton) -+ { -+ pthread_join(thread, (void **)&disc_reason); -+ printf("thread joint disconnect reason %d\n", disc_reason); -+ } -+ else if (g_thread_count > 0) - { - printf("main thread, waiting for all threads to exit\n"); - freerdp_sem_wait(&g_sem); -@@ -787,5 +814,5 @@ main(int argc, char ** argv) - - freerdp_chanman_uninit(); - freerdp_global_finish(); -- return 0; -+ return disc_reason; - } -diff --git a/doc/xfreerdp.1 b/doc/xfreerdp.1 -index 9fa07ca..1ad0d70 100644 ---- a/doc/xfreerdp.1 -+++ b/doc/xfreerdp.1 -@@ -92,6 +92,10 @@ Disable TLS encryption. - .BR "--no-osb" - Disable off screen bitmaps. - .TP -+.BR "--singleton" -+Singleton mode. This mode allows only one thread of execution and also returns -+the Set Error Info PDU as the program exit code. -+.TP - .BR "-h" - Print help message. - .TP --- -1.6.6.1 -
recipes/freerdp/freerdp_git.bb +3 -4
@@ -1,4 +1,4 @@ -# Copyright (C) 2010, O.S. Systems Software Ltda. All Rights Reserved +# Copyright (C) 2010, 2011, O.S. Systems Software Ltda. # Released under the MIT license include freerdp.inc
@@ -9,8 +9,7 @@ PV = "gitr${SRCPV}" PKGV = "${GITPKGVTAG}" PR = "${INC_PR}.1" -SRCREV = "6f7eb2abb077d60a09eeb66a10ad97d102336d3c" -SRC_URI = "git://freerdp.git.sourceforge.net/gitroot/freerdp/freerdp.git;protocol=git \ - file://singleton-mode.patch" +SRCREV = "7bbde4fb3bc3a781364d0a626c49bc165cc507fd" +SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;protocol=git" S = "${WORKDIR}/git"
Signature · 1 line
1.7.1
PATCH 7/17 kernel.bbclass: store EXTENDPV into STAGING_KERNEL_DIR
In reply to Otavio Salvador--- classes/kernel.bbclass | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
classes/kernel.bbclass +1 -0
@@ -208,6 +208,7 @@ sysroot_stage_all_append() { ln -sf config-${KERNEL_VERSION} $kerneldir/.config ln -sf config-${KERNEL_VERSION} $kerneldir/kernel-config echo "${KERNEL_VERSION}" >$kerneldir/kernel-abiversion + echo "${EXTENDPV}" >$kerneldir/kernel-extendpv echo "${S}" >$kerneldir/kernel-source echo "${KERNEL_CCSUFFIX}" >$kerneldir/kernel-ccsuffix echo "${KERNEL_LDSUFFIX}" >$kerneldir/kernel-ldsuffix
Signature · 1 line
1.7.1
PATCH 8/17 libav: depends on yasm-native
In reply to Otavio Salvador--- recipes/libav/libav.inc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
recipes/libav/libav.inc +2 -2
@@ -11,10 +11,10 @@ ARM_INSTRUCTION_SET = "arm" PE = "2" -DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}" +DEPENDS = "zlib libogg libvorbis libtheora faac faad2 yasm-native ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}" RSUGGESTS_${PN} = "mplayer" -INC_PR = "r0" +INC_PR = "r1" inherit autotools pkgconfig
Signature · 1 line
1.7.1
PATCH 9/17 initramfs-uniboot: be quiet and avoid code duplication
In reply to Otavio Salvador * add getarg method to parse /proc/cmdline and return the option value;
* refactor readargs to use getarg API;
* avoid printing when 'quiet' boot param is used;
--- recipes/initrdscripts/files/init.sh | 60 ++++++++++++++--------- recipes/initrdscripts/initramfs-uniboot_1.0.bb | 2 +- 2 files changed, 37 insertions(+), 25 deletions(-)
recipes/initrdscripts/files/init.sh +36 -24
@@ -3,6 +3,7 @@ MODULE_DIR=/initrd.d BOOT_ROOT= ROOT_DEVICE= +VERBOSE= early_setup() { mkdir -p /proc /sys /mnt /tmp
@@ -13,34 +14,45 @@ early_setup() { modprobe -q mtdblock } +info() { + [ -n "$VERBOSE" ] && echo $* +} + dev_setup() { - echo -n "initramfs: Creating device nodes: " + info -n "initramfs: Creating device nodes: " grep '^ *[0-9]' /proc/partitions | while read major minor blocks dev do if [ ! -e /dev/$dev ]; then - echo -n "$dev " + info -n "$dev " [ -e /dev/$dev ] || mknod /dev/$dev b $major $minor fi done - echo + info } -read_args() { - [ -z "$CMDLINE" ] && CMDLINE=`cat /proc/cmdline` - for arg in $CMDLINE; do - optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'` - case $arg in - root=*) - ROOT_DEVICE=$optarg ;; - rootfstype=*) - ROOT_FSTYPE=$optarg ;; - rootdelay=*) - rootdelay=$optarg ;; - debug) set -x ;; - shell) sh ;; - esac +getarg() { + local o + + [ -z "$cmdline" ] && cmdline=`cat /proc/cmdline` + for o in $cmdline; do + test "$o" = "$1" && return 0 + if test "${o%%=*}" = "${1%=}"; then + echo ${o#*=} + return 0 + fi done + return 1 +} + +read_args() { + ROOT_DEVICE=$(getarg root=) + ROOTFS_TYPE=$(getarg rootfstype=) + rootdelay=$(getarg rootdelay=) + + getarg debug && set -x + getarg quiet || VERBOSE=1 + getarg shell && sh } do_depmod() {
@@ -49,7 +61,7 @@ do_depmod() { load_module() { # Cannot redir to $CONSOLE here easily - may not be set yet - echo "initramfs: Loading $module module" + info "initramfs: Loading $module module" source $1 }
@@ -71,22 +83,22 @@ fatal() { } -echo "Starting initramfs boot..." early_setup +read_args + +info "Starting initramfs boot..." load_modules '0*' do_depmod [ -z "$CONSOLE" ] && CONSOLE="/dev/console" -read_args - if [ -z "$rootdelay" ]; then - echo "rootdelay parameter was not passed on kernel command line - assuming 2s delay" - echo "If you would like to avoid this delay, pass explicit rootdelay=0" + info "rootdelay parameter was not passed on kernel command line - assuming 2s delay" + info "If you would like to avoid this delay, pass explicit rootdelay=0" rootdelay="2" fi if [ -n "$rootdelay" ]; then - echo "Waiting $rootdelay seconds for devices to settle..." >$CONSOLE + info "Waiting $rootdelay seconds for devices to settle..." >$CONSOLE sleep $rootdelay fi
recipes/initrdscripts/initramfs-uniboot_1.0.bb +1 -1
@@ -1,5 +1,5 @@ SRC_URI = "file://init.sh" -PR = "r12" +PR = "r13" DESCRIPTION = "A modular initramfs init script system." RRECOMMENDS_${PN} = "kernel-module-mtdblock"
Signature · 1 line
1.7.1
PATCH 10/17 initramfs-module-squashfs: port to new getarg API
In reply to Otavio Salvador--- recipes/initrdscripts/files/80-squashfs.sh | 18 +++++++----------- .../initrdscripts/initramfs-module-squashfs_1.0.bb | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-)
recipes/initrdscripts/files/80-squashfs.sh +7 -11
@@ -1,17 +1,13 @@ squashfs_mount () { modprobe -q squashfs - mkdir $2 + mkdir -p $2 mount -t squashfs $1 $2 } -for arg in $CMDLINE; do - optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'` - echo $arg xxx $optarg - case $arg in - squashfs=*) - dev=`expr "$optarg" : '\([^:]*\).*'` - path=`expr "$optarg" : '[^:]*:\([^:]*\).*'` - squashfs_mount $dev $path ;; - esac -done +squashfs=$(getarg squashfs=) +if [ -n "$squashfs" ]; then + dev=`expr "$squashfs" : '\([^:]*\).*'` + path=`expr "$squashfs" : '[^:]*:\([^:]*\).*'` + squashfs_mount $dev $path +fi
recipes/initrdscripts/initramfs-module-squashfs_1.0.bb +1 -1
@@ -1,5 +1,5 @@ SRC_URI = "file://80-squashfs.sh" -PR = "r2" +PR = "r3" DESCRIPTION = "An initramfs module for mount squashfs." RDEPENDS_${PN} = "initramfs-uniboot"
Signature · 1 line
1.7.1
PATCH 11/17 initramfs-module-ext3: port to new getarg API
In reply to Otavio Salvador--- recipes/initrdscripts/files/80-ext3.sh | 16 ++++++---------- recipes/initrdscripts/initramfs-module-ext3_1.0.bb | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-)
recipes/initrdscripts/files/80-ext3.sh +6 -10
@@ -5,13 +5,9 @@ ext3_mount () { mount -t ext3 -onoatime,data=journal,errors=continue $1 $2 } -for arg in $CMDLINE; do - optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'` - echo $arg xxx $optarg - case $arg in - ext3=*) - dev=`expr "$optarg" : '\([^:]*\).*'` - path=`expr "$optarg" : '[^:]*:\([^:]*\).*'` - ext3_mount $dev $path ;; - esac -done +ext3=$(getarg ext3=) +if [ -n "$ext3" ]; then + dev=`expr "$ext3" : '\([^:]*\).*'` + path=`expr "$ext3" : '[^:]*:\([^:]*\).*'` + ext3_mount $dev $path +fi
recipes/initrdscripts/initramfs-module-ext3_1.0.bb +1 -1
@@ -1,5 +1,5 @@ SRC_URI = "file://80-ext3.sh" -PR = "r2" +PR = "r3" DESCRIPTION = "An initramfs module for mount ext3." RDEPENDS_${PN} = "initramfs-uniboot"
Signature · 1 line
1.7.1
PATCH 12/17 initramfs-module-block: use info method from uniboot
In reply to Otavio Salvador--- recipes/initrdscripts/files/85-blockboot.sh | 2 +- .../initrdscripts/initramfs-module-block_1.0.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
recipes/initrdscripts/files/85-blockboot.sh +1 -1
@@ -2,7 +2,7 @@ # Allow booting from a normal block device. if [ -e "$ROOT_DEVICE" ]; then - echo "booting from: $ROOT_DEVICE" + info "booting from: $ROOT_DEVICE" type="" if [ -n "$ROOT_FSTYPE" ]; then type="-t $ROOT_FSTYPE"
recipes/initrdscripts/initramfs-module-block_1.0.bb +1 -1
@@ -1,5 +1,5 @@ SRC_URI = "file://85-blockboot.sh" -PR = "r4" +PR = "r5" RDEPENDS_${PN} = "initramfs-uniboot" DESCRIPTION = "An initramfs module for booting off normal block devices."
Signature · 1 line
1.7.1
PATCH 13/17 initramfs-module-block: use ROOT_DEVICE mountpoint if available
In reply to Otavio Salvador--- recipes/initrdscripts/files/85-blockboot.sh | 9 +++++++-- .../initrdscripts/initramfs-module-block_1.0.bb | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-)
recipes/initrdscripts/files/85-blockboot.sh +7 -2
@@ -7,6 +7,11 @@ if [ -e "$ROOT_DEVICE" ]; then if [ -n "$ROOT_FSTYPE" ]; then type="-t $ROOT_FSTYPE" fi - mount $type "$ROOT_DEVICE" /mnt || fatal "Unable to mount rootfs device" - BOOT_ROOT=/mnt + + if ! mount | grep -q "$ROOT_DEVICE"; then + mount $type "$ROOT_DEVICE" /mnt || fatal "Unable to mount rootfs device" + BOOT_ROOT=/mnt + else + BOOT_ROOT=`expr "$(mount | grep $ROOT_DEVICE)" : '.* on \([^ ]*\)'` + fi fi
recipes/initrdscripts/initramfs-module-block_1.0.bb +1 -1
@@ -1,5 +1,5 @@ SRC_URI = "file://85-blockboot.sh" -PR = "r5" +PR = "r6" RDEPENDS_${PN} = "initramfs-uniboot" DESCRIPTION = "An initramfs module for booting off normal block devices."
Signature · 1 line
1.7.1
PATCH 14/17 initramfs-module-mdev: add
In reply to Otavio Salvador--- recipes/initrdscripts/files/00-mdev.sh | 19 +++++++++++++++++++ recipes/initrdscripts/files/99-mdev.sh | 6 ++++++ recipes/initrdscripts/initramfs-module-mdev_1.0.bb | 13 +++++++++++++ 3 files changed, 38 insertions(+), 0 deletions(-) create mode 100644 recipes/initrdscripts/files/00-mdev.sh create mode 100644 recipes/initrdscripts/files/99-mdev.sh create mode 100644 recipes/initrdscripts/initramfs-module-mdev_1.0.bb
recipes/initrdscripts/files/00-mdev.sh new file +19 -0
@@ -0,0 +1,19 @@ +load() { + modprobe $1 >/dev/null 2>&1 && info "Loaded module $1" +} + +# setup the environment +mkdir -p /dev +mount -t tmpfs tmpfs /dev +mkdir -m 0755 /dev/pts +mkdir -m 1777 /dev/shm +mount -t devpts devpts /dev/pts + +echo /sbin/mdev > /proc/sys/kernel/hotplug +mdev -s + +# modules for disk nodes +load sd-mod + +# load modules for devices +find /sys -name modalias | while read m; do load $(cat $m) >/dev/null 2>&1; done
recipes/initrdscripts/files/99-mdev.sh new file +6 -0
@@ -0,0 +1,6 @@ +if [ -n "$BOOT_ROOT" ]; then + # move filesystems over to the mounted root + mount --move /dev $BOOT_ROOT/dev + mount --move /proc $BOOT_ROOT/proc + mount --move /sys $BOOT_ROOT/sys +fi
recipes/initrdscripts/initramfs-module-mdev_1.0.bb new file +13 -0
@@ -0,0 +1,13 @@ +SRC_URI = "file://00-mdev.sh file://99-mdev.sh" +PR = "r1" +RDEPENDS_${PN} = "initramfs-uniboot" +DESCRIPTION = "An initramfs module to setup mdev and load modules" + +do_install() { + install -d ${D}/initrd.d + install -m 0755 ${WORKDIR}/00-mdev.sh ${D}/initrd.d/ + install -m 0755 ${WORKDIR}/99-mdev.sh ${D}/initrd.d/ +} + +PACKAGE_ARCH = "all" +FILES_${PN} += " /initrd.d/* "
Signature · 1 line
1.7.1
PATCH 15/17 package.bbclass: add Qt translation support into package_do_split_locales
In reply to Otavio Salvador--- classes/package.bbclass | 41 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 37 insertions(+), 4 deletions(-)
classes/package.bbclass +37 -4
@@ -314,6 +314,8 @@ python package_do_split_locales() { bb.debug(1, "package requested not splitting locales") return + import re + packages = (bb.data.getVar('PACKAGES', d, True) or "").split() datadir = bb.data.getVar('datadir', d, True)
@@ -329,12 +331,29 @@ python package_do_split_locales() { localedir = os.path.join(dvar + datadir, 'locale') - if not os.path.isdir(localedir): + locales = [] + if os.path.isdir(localedir): + locales = os.listdir(localedir) + + # Check of Qt translation files + qm_re = re.compile("(.*)\.qm$") + qm_files = {} + for root, dirs, files in os.walk(dvar): + for file in files: + qm_file = qm_re.match(file) + if qm_file: + locale = qm_file.group(1) + relpath = os.path.join(root, file).replace(dvar + '/', '', 1) + if relpath: + if not qm_files.has_key(locale): + qm_files[locale] = [] + + qm_files[locale].append(relpath) + + if len(locales) == 0 and len(qm_files) == 0: bb.debug(1, "No locale files in this package") return - locales = os.listdir(localedir) - # This is *really* broken mainpkg = packages[0] # At least try and patch it up I guess...
@@ -343,11 +362,25 @@ python package_do_split_locales() { if mainpkg.find('-dev'): mainpkg = mainpkg.replace('-dev', '') + # Queue Qt locales for spliting + for l in qm_files.keys(): + if l not in locales: + locales.append(l) + for l in locales: ln = legitimize_package_name(l) pkg = pn + '-locale-' + ln packages.append(pkg) - bb.data.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l), d) + + files = [] + files.append(os.path.join(datadir, 'locale', l)) + + if qm_files.has_key(l): + locale_re = re.compile("^.*([a-z]{2}(_[A-Z]{2})?)$") + ln = legitimize_package_name(locale_re.match(l).group(1)) + files += qm_files[l] + + bb.data.setVar('FILES_' + pkg, " ".join(files), d) bb.data.setVar('RDEPENDS_' + pkg, '%s virtual-locale-%s' % (mainpkg, ln), d) bb.data.setVar('RPROVIDES_' + pkg, '%s-locale %s-translation' % (pn, ln), d) bb.data.setVar('DESCRIPTION_' + pkg, '%s translation for %s' % (l, pn), d)
Signature · 1 line
1.7.1
PATCH 16/17 qt4.inc: add locale to PACKAGES_DYNAMIC list
In reply to Otavio Salvador--- recipes/qt4/qt4.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
recipes/qt4/qt4.inc +1 -1
@@ -95,7 +95,7 @@ OTHER_PACKAGES = "\ ${QT_BASE_NAME}-qml-plugins" PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}" -PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-*" +PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-* ${PN}-locale-*" ALLOW_EMPTY_${PN} = "1" ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1"
Signature · 1 line
1.7.1
PATCH 17/17 firefox-l10n-pt-br: update to 3.6.8 and sync with O.S. Systems tree
In reply to Otavio Salvador--- recipes/mozilla/firefox-l10n-pt-br_3.0.4.bb | 9 -------- recipes/mozilla/firefox-l10n-pt-br_3.6.8.bb | 9 ++++++++ recipes/mozilla/firefox-l10n.inc | 29 +++++++++++++-------------- 3 files changed, 23 insertions(+), 24 deletions(-) delete mode 100644 recipes/mozilla/firefox-l10n-pt-br_3.0.4.bb create mode 100644 recipes/mozilla/firefox-l10n-pt-br_3.6.8.bb
recipes/mozilla/firefox-l10n-pt-br_3.0.4.bb deleted +0 -9
@@ -1,9 +0,0 @@ -# Copyright (C) 2009, O.S. Systems Software Ltda. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -require firefox-l10n.inc - -PR = "${INC_PR}.1" - -SRC_URI[md5sum] = "29c672886aa9ca41428ba04196938545" -SRC_URI[sha256sum] = "1474828a58f893bed20f0e0cd26bc310c7472d69bf7a1ae01c00a371de256b1a"
recipes/mozilla/firefox-l10n-pt-br_3.6.8.bb new file +9 -0
@@ -0,0 +1,9 @@ +# Copyright (C) 2009, 2011, O.S. Systems Software Ltda. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require firefox-l10n.inc + +PR = "${INC_PR}.1" + +SRC_URI[md5sum] = "fa333ab8c9c108f9714827d517191d0a" +SRC_URI[sha256sum] = "759dccbe0ce21abe1ecb6b76fccb777c23422370a8aec2b5cccf25745ab0cb9b"
recipes/mozilla/firefox-l10n.inc +14 -15
@@ -1,10 +1,9 @@ -# Copyright (C) 2009, O.S. Systems Software Ltda. All Rights Reserved +# Copyright (C) 2009, 2011, O.S. Systems Software Ltda. All Rights Reserved # Released under the MIT license (see packages/COPYING) def get_language_name(package): lang = package.replace('firefox-l10n-', '') - - if lang.find('-'): + if lang.find('-') != -1: lang = lang.split('-') lang[1] = lang[1].upper() lang = '-'.join(lang)
@@ -12,35 +11,35 @@ def get_language_name(package): return lang DEPENDS = "unzip-native" -RDEPENDS_${PN} = "firefox" +RDEPENDS = "firefox" LANGUAGE = "${@get_language_name('${PN}')}" +FIREFOX_PV = "${PV}" +INC_PR = "r3" SRC_URI = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/linux-i686/xpi/${LANGUAGE}.xpi" S = "${WORKDIR}" do_configure() { - unzip -o -q -d ${LANGUAGE} ${LANGUAGE}.xpi + unzip -o -q -d ${LANGUAGE} *.xpi } -INC_PR = "r2" - do_install() { cd ${S}/${LANGUAGE} # Get extension UUID - EXTENSION=`cat install.rdf | sed --posix '/em:id=/!d;s/[ ]*em:id="//;s/".*//'` + EXTENSION=`cat install.rdf | sed --posix '/em:id[=>]/!d;s/[[:space:]]*<*em:id[=>]"*//;s/["<].*//' | head -n 1` - mkdir -p ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION}/chrome - mkdir -p ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION}/uninstall - install -m 644 chrome/*.jar ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION}/chrome - install -m 644 install.rdf ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION} - install -m 644 chrome.manifest ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION} + mkdir -p ${D}/usr/lib/firefox-${FIREFOX_PV}/extensions/${EXTENSION}/chrome + mkdir -p ${D}/usr/lib/firefox-${FIREFOX_PV}/extensions/${EXTENSION}/uninstall + cp -R chrome ${D}/usr/lib/firefox-${FIREFOX_PV}/extensions/${EXTENSION}/ + install -m 644 install.rdf ${D}/usr/lib/firefox-${FIREFOX_PV}/extensions/${EXTENSION} + install -m 644 chrome.manifest ${D}/usr/lib/firefox-${FIREFOX_PV}/extensions/${EXTENSION} cat install.rdf \ | sed --posix '/<em:locale>/!d' \ | sed --posix "s/.*/register global locale ${LANGUAGE}/" \ - > ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION}/uninstall/Uninstall + > ${D}/usr/lib/firefox-${FIREFOX_PV}/extensions/${EXTENSION}/uninstall/Uninstall } -FILES_${PN} += "/usr/lib/firefox-${PV}" +FILES_${PN} += "/usr/lib/firefox-${FIREFOX_PV}" PACKAGE_ARCH = "all"
Signature · 1 line
1.7.1