gstd: fix type in RRECOMENDS
PATCH 1/12 gstd: fix type in RRECOMENDS
/RRECOMENDS/s/COM/COMM/
--- recipes/gstd/gstd_git.bb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
recipes/gstd/gstd_git.bb +1 -1
@@ -25,7 +25,7 @@ do_configure() { } RDEPENDS_${PN} = "dbus dbus-glib gstreamer gst-plugins-base" -RRECOMENDS_${PN} = "gstreamer-ti" +RRECOMMENDS_${PN} = "gstreamer-ti" FILES_${PN} += "${datadir}/dbus-1/*/*.service" FILES_${PN}-dev += "${datadir}/dbus-1/interfaces/*.xml"
Signature · 1 line
1.7.2.3
PATCH 2/12 class_image: fix typos
--- docs/usermanual/reference/class_image.xml | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
docs/usermanual/reference/class_image.xml +7 -7
@@ -18,7 +18,7 @@ <para>Inherits the rootfs class for the appropriate package type, typically <xref linkend="rootfs_ipkg_class" />, in order to bring in the functionality required to generate a root filesystem image. The root - filesystem image is generate from a set of of packages (typically .ipkg + filesystem image is generated from a set of of packages (typically .ipkg packages), and then the required images are generated using the contents of the root filesystem;</para> </listitem>
@@ -26,7 +26,7 @@ <listitem> <para>Sets <command>BUILD_ALL_DEPS = "1"</command> to force the dependency system to build all packages that are listed in the - <command>RDEPENDS</command> and/or <command>RRECOMENDS</command> of the + <command>RDEPENDS</command> and/or <command>RRECOMMENDS</command> of the packages to be installed;</para> </listitem>
@@ -126,7 +126,7 @@ <listitem> <para>Specifies the file that lists the device nodes that should be - created in the <command>/dev </command>directory of the image. This + created in the <command>/dev</command> directory of the image. This needs to be an absolute filename and so should be specified relative to <command>${BBPATH}</command>. Only a single device table is supported. Use <command>IMAGE_DEVICE_TABLES</command> instead if you
@@ -217,8 +217,8 @@ <para>The <command>IMAGE_PREPROCESS_COMMAND</command> and <command>IMAGE_POSTPROCESS_COMMAND</command> variables will be processed - within the same <xref linkend="fakeroot" /> instance as the rest of the - rest of this class.</para> + within the same <xref linkend="fakeroot" /> instance as the rest of + this class.</para> </section> <section>
@@ -292,12 +292,12 @@ IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt files/device_table_add-sci <para>"Package feed", or feed for short, is a term used by <command>ipkg</command> package manager, commonly used in embedded systems, to name a package repository - holding packages. Structurally, a feed is a directory - local, or on HTTP of FTP server, - + holding packages. Structurally, a feed is a directory - local, or on HTTP or FTP server, - holding packages and package descriptor file, named <command>Packages</command> or <command>Packages.gz</command> if compressed. Multiple feeds are supported.</para> <para>OpenEmbedded has support to pre-configure feeds within generated images, - so once image is installed on a device, user can immediately install new software, + so once an image is installed on a device, the user can immediately install new software, without the need to manually edit config files. There are several ways to pre-configure feed support, described below.</para>
Signature · 1 line
1.7.2.3
Re: [PATCH 02/12] class_image: fix typos
В сообщении от Понедельник 03 января 2011 23:01:56 автор Bernhard Reutner- Fischer написал:
Quoted 4 lines
Signed-off-by Bernhard Reutner-Fischer <[email protected]>--- docs/usermanual/reference/class_image.xml | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
Signature · 3 lines
http://roman.khimov.ru mailto: [email protected] gpg --keyserver hkp://subkeys.pgp.net --recv-keys 0xE5E055C3
PATCH 3/12 image.bbclass: rm symlink destination via ln
In reply to Bernhard Reutner-FischerRather than rm'ing the destination-file manually, do ln -f
--- classes/image.bbclass | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
classes/image.bbclass +1 -2
@@ -140,8 +140,7 @@ def get_imagecmds(d): cmd = "\t#Code for image type " + type + "\n" cmd += "\t${IMAGE_CMD_" + type + "}\n" cmd += "\tcd ${DEPLOY_DIR_IMAGE}/\n" - cmd += "\trm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n" - cmd += "\tln -s ${IMAGE_NAME}.rootfs." + type + " ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n\n" + cmd += "\tln -fs ${IMAGE_NAME}.rootfs." + type + " ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n\n" cmds += bb.data.expand(cmd, localdata) return cmds
Signature · 1 line
1.7.2.3
Re: [PATCH 03/12] image.bbclass: rm symlink destination via ln
В сообщении от Понедельник 03 января 2011 23:01:57 автор Bernhard Reutner- Fischer написал:
Quoted 3 lines
Rather than rm'ing the destination-file manually, do ln -f
Signed-off-by Bernhard Reutner-Fischer <[email protected]>
Signature · 3 lines
http://roman.khimov.ru mailto: [email protected] gpg --keyserver hkp://subkeys.pgp.net --recv-keys 0xE5E055C3
PATCH 4/12 bitbake.conf: add cpio and ext4 .xz support
In reply to Bernhard Reutner-FischerXZ_COMPRESSION_LEVEL ?= "-e -9"
so people can override according to their available memory
--- conf/bitbake.conf | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
conf/bitbake.conf +7 -0
@@ -147,6 +147,9 @@ QEMU_OPTIONS_armv6 = "-cpu arm1136" QEMU_OPTIONS_armv6-novfp = "-cpu arm1136" QEMU_OPTIONS_armv7a = "-cpu cortex-a8" +# default compression levels +XZ_COMPRESSION_LEVEL ?= "-e -9" + ################################################################## # Date/time variables. ##################################################################
@@ -385,6 +388,7 @@ IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 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.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} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.xz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.xz" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma"
@@ -393,6 +397,7 @@ 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_cpio = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) ${EXTRA_IMAGECMD}" IMAGE_CMD_cpio.gz = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz) ${EXTRA_IMAGECMD}" +IMAGE_CMD_cpio.xz = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | xz -c ${XZ_COMPRESSION_LEVEL} > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.xz) ${EXTRA_IMAGECMD}" IMAGE_CMD_cpio.gz.u-boot = "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 = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | lzma -c -9 >${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}.rootfs.ubifs >> 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}.rootfs.ubifs ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg"
@@ -422,8 +427,10 @@ IMAGE_DEPENDS_ext3.bz2 = "genext2fs-native e2fsprogs-native" IMAGE_DEPENDS_ext4 = "genext2fs-native e2fsprogs-native" 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.xz = "xz-native" IMAGE_DEPENDS_squashfs = "squashfs-tools-native" IMAGE_DEPENDS_squashfs-lzma = "squashfs-tools-native" IMAGE_DEPENDS_ubi = "mtd-utils-native"
Signature · 1 line
1.7.2.3
PATCH 5/12 uclibc: shared-flat: put crtreloc.o into -dev package
In reply to Bernhard Reutner-Fischer--- recipes/uclibc/uclibc.inc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
recipes/uclibc/uclibc.inc +2 -1
@@ -52,6 +52,7 @@ FILES_uclibc-dev_append = "\ ${libdir}/lib*.so \ ${libdir}/*_nonshared.a \ ${libdir}/[S]*crt[1in].o \ + ${libdir}/crtreloc*.o \ ${libdir}/lib*.a \ ${includedir}/*.h ${includedir}/*/*.h \ "
@@ -60,7 +61,7 @@ FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug" FILES_uclibc-gconv = "${libdir}/gconv" FILES_uclibc-thread-db = "/lib/libthread_db*" RPROVIDES_uclibc-dev += "libc-dev virtual-libc-dev" -# uclibc does not really has libsegfault but then using the one from glibc is also not +# uclibc does not really have libsegfault but then using the one from glibc is also not # going to work. So we pretend that we have it to make bitbake not pull other recipes # to satisfy this dependency for the images/tasks RPROVIDES_${PN} += "libsegfault"
Signature · 1 line
1.7.2.3
Re: [PATCH 05/12] uclibc: shared-flat: put crtreloc.o into -dev package
[khem, thanks alot for pushing the already ACKed hunks, i would have only pushed them now.. |-) ]
khem, i know that flat is NIH in OE ATM but i consider this preparatory work. I still feed my bfin with my own setup but that hunk is potentially a step in the right direction -- towards OE. So..
ping?
cheers,
Quoted 29 lines · Bernhard Reutner-Fischer
Signed-off-by Bernhard Reutner-Fischer <[email protected]>---
recipes/uclibc/uclibc.inc | 3 ++-1 files changed, 2 insertions(+), 1 deletions(-)recipes/uclibc/uclibc.inc +1
-0@@ -52,6 +52,7 @@ FILES_uclibc-dev_append = "\ ${libdir}/lib*.so \ ${libdir}/*_nonshared.a \ ${libdir}/[S]*crt[1in].o \ + ${libdir}/crtreloc*.o \ ${libdir}/lib*.a \ ${includedir}/*.h ${includedir}/*/*.h \ "@@ -60,7 +61,7 @@ FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug"FILES_uclibc-gconv = "${libdir}/gconv" FILES_uclibc-thread-db = "
/lib/libthread_db*" RPROVIDES_uclibc-dev += "libc-dev virtual-libc-dev"recipes/uclibc/uclibc.inc +1
-1-# uclibc does not really has libsegfault but then using the one from glibc is also not +# uclibc does not really have libsegfault but then using the one from glibc is also not# going to work. So we pretend that we have it to make bitbake not pull other recipes # to satisfy this dependency for the images/tasks RPROVIDES_${PN} += "libsegfault"Signature · 1 line
1.7.2.3
Re: [PATCH 05/12] uclibc: shared-flat: put crtreloc.o into -dev package
Quoted 8 lines · Bernhard Reutner-Fischer
[khem, thanks alot for pushing the already ACKed hunks, i would have only pushed them now.. |-) ]
khem, i know that flat is NIH in OE ATM but i consider this preparatory work. I still feed my bfin with my own setup but that hunk is potentially a step in the right direction -- towards OE. So..
ping?
I have already applied this patch. Check patchwork and or repo
Quoted 32 lines
cheers,
Quoted 29 lines · Bernhard Reutner-Fischer
Signed-off-by Bernhard Reutner-Fischer<[email protected]>---
recipes/uclibc/uclibc.inc | 3 ++-1 files changed, 2 insertions(+), 1 deletions(-)recipes/uclibc/uclibc.inc +1
-0@@ -52,6 +52,7 @@ FILES_uclibc-dev_append = "\ ${libdir}/lib*.so \ ${libdir}/*_nonshared.a \ ${libdir}/[S]*crt[1in].o \ + ${libdir}/crtreloc*.o \ ${libdir}/lib*.a \ ${includedir}/*.h ${includedir}/*/*.h \ "@@ -60,7 +61,7 @@ FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug"FILES_uclibc-gconv = "${libdir}/gconv" FILES_uclibc-thread-db = "
/lib/libthread_db*" RPROVIDES_uclibc-dev += "libc-dev virtual-libc-dev"recipes/uclibc/uclibc.inc +1
-1-# uclibc does not really has libsegfault but then using the one from glibc is also not +# uclibc does not really have libsegfault but then using the one from glibc is also not# going to work. So we pretend that we have it to make bitbake not pull other recipes # to satisfy this dependency for the images/tasks RPROVIDES_${PN} += "libsegfault" -- 1.7.2.3
PATCH 6/12 busybox: remove superfluous newlines from mdev init script
In reply to Bernhard Reutner-Fischer--- recipes/busybox/files/mdev | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)
recipes/busybox/files/mdev +1 -5
@@ -1,11 +1,7 @@ #!/bin/sh mount -t tmpfs tmpfs /dev -o size=64k,mode=0755 - mkdir /dev/pts /dev/shm - mount -t devpts devpts /dev/pts - -echo "/sbin/mdev" >/proc/sys/kernel/hotplug - +echo "/sbin/mdev" > /proc/sys/kernel/hotplug mdev -s
Signature · 1 line
1.7.2.3
Re: [PATCH 06/12] busybox: remove superfluous newlines from mdev init script
В сообщении от Понедельник 03 января 2011 23:02:00 автор Bernhard Reutner- Fischer написал:
Quoted 4 lines
Signed-off-by Bernhard Reutner-Fischer <[email protected]>--- recipes/busybox/files/mdev | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)
Signature · 3 lines
http://roman.khimov.ru mailto: [email protected] gpg --keyserver hkp://subkeys.pgp.net --recv-keys 0xE5E055C3
PATCH 7/12 busybox: simplify handling of busybox-static
In reply to Bernhard Reutner-Fischer--- recipes/busybox/busybox-static_1.17.4.bb | 8 +------- recipes/busybox/busybox-static_1.18.1.bb | 6 ------ recipes/busybox/busybox.inc | 15 +++++++++++++-- 3 files changed, 14 insertions(+), 15 deletions(-)
recipes/busybox/busybox-static_1.17.4.bb +1 -7
@@ -1,11 +1,5 @@ require busybox_${PV}.bb -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" FILESPATHPKG =. "busybox-${PV}:" S = "${WORKDIR}/busybox-${PV}" - -do_configure_append() { - sed -i -e '/CONFIG_STATIC/d' .config - echo "CONFIG_STATIC=y" >>.config -} -
recipes/busybox/busybox-static_1.18.1.bb +0 -6
@@ -2,9 +2,3 @@ require busybox_${PV}.bb FILESPATHPKG =. "busybox-${PV}:" S = "${WORKDIR}/busybox-${PV}" - -do_configure_append() { - sed -i -e '/CONFIG_STATIC/d' .config - echo "CONFIG_STATIC=y" >>.config -} -
recipes/busybox/busybox.inc +13 -2
@@ -11,7 +11,7 @@ LICENSE = "GPLv2" SECTION = "base" PRIORITY = "required" -INC_PR = "r38" +INC_PR = "r39" SRC_URI = "\ file://busybox-cron \
@@ -97,9 +97,11 @@ python () { d) } -do_configure () { +do_prepare_config () { sed -e 's#@DATADIR@#${datadir}#g' \ < ${WORKDIR}/defconfig > ${S}/.config + sed -i -e '/CONFIG_STATIC/d' .config + echo "# CONFIG_STATIC is not set" >> .config for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \ ${S}/.config sed -i -e '${configmangle}' ${S}/.config
@@ -112,6 +114,15 @@ do_configure () { {if(net==2&&$0 !~ /^#/&&$1){print("# "$1" is not set")}else{print}}' \ ${S}/.config.oe-tmp > ${S}/.config fi +} + +do_prepare_config_append_pn-busybox-static() { + sed -i -e '/CONFIG_STATIC/d' .config + echo "CONFIG_STATIC=y" >>.config +} + +do_configure () { + do_prepare_config cml1_do_configure }
Signature · 1 line
1.7.2.3
Re: [PATCH 07/12] busybox: simplify handling of busybox-static
Ping?
This is a first step into sanitizing busybox recipes, although it doesn't really cleanup much ATM.
In the long run, i have already thought about virtualizing busybox into coreutils/util-linux/init/whatnot and use packages and u-a (to handle these opkg-packages natively via rootfs_opkg and pstaging w/ opkg-cl -O). We now do a real install with the superset of {,-static} each and use u-a to properly set the tools per provider. But anyway. The above was a step. ACK?
Quoted 83 lines · Bernhard Reutner-Fischer
Signed-off-by Bernhard Reutner-Fischer <[email protected]>---
recipes/busybox/busybox-static_1.17.4.bb | 8 +------- recipes/busybox/busybox-static_1.18.1.bb | 6 ------ recipes/busybox/busybox.inc | 15 +++++++++++++-- 3 files changed, 14 insertions(+), 15 deletions(-)recipes/busybox/busybox-static_1.17.4.bb +0
-0@@ -1,11 +1,5 @@require busybox_${PV}.bb
recipes/busybox/busybox-static_1.17.4.bb +1
-1-PR = "${INC_PR}.0" +PR = "${INC_PR}.1"FILESPATHPKG =. "busybox-${PV}:"
S = "${WORKDIR}/busybox-${PV}"recipes/busybox/busybox-static_1.17.4.bb +0
-6- -do_configure_append() { - sed -i -e '/CONFIG_STATIC/d' .config - echo "CONFIG_STATIC=y" >>.config -} -recipes/busybox/busybox-static_1.18.1.bb +0
-0@@ -2,9 +2,3 @@ require busybox_${PV}.bbFILESPATHPKG =. "busybox-${PV}:"
S = "${WORKDIR}/busybox-${PV}"recipes/busybox/busybox-static_1.18.1.bb +0
-6- -do_configure_append() { - sed -i -e '/CONFIG_STATIC/d' .config - echo "CONFIG_STATIC=y" >>.config -} -recipes/busybox/busybox.inc +0
-0@@ -11,7 +11,7 @@ LICENSE = "GPLv2"SECTION = "base"
PRIORITY = "required"recipes/busybox/busybox.inc +1
-1-INC_PR = "r38" +INC_PR = "r39"
SRC_URI= "\
file://busybox-cron \recipes/busybox/busybox.inc +12
-1@@ -97,9 +97,11 @@ python () { d) } -do_configure () { +do_prepare_config () { sed -e 's#@DATADIR@#${datadir}#g' \ < ${WORKDIR}/defconfig > ${S}/.config + sed -i -e '/CONFIG_STATIC/d' .config + echo "# CONFIG_STATIC is not set" >> .config for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \ ${S}/.config sed -i -e '${configmangle}' ${S}/.config@@ -112,6 +114,15 @@ do_configure () { {if(net==2&&$0 !~ /^#/&&$1){print("# "$1" is not set")}else{print}}' \ ${S}/.config.oe-tmp > ${S}/.config fi +} + +do_prepare_config_append_pn-busybox-static() { + sed -i -e '/CONFIG_STATIC/d' .config + echo "CONFIG_STATIC=y" >>.config +} + +do_configure () { + do_prepare_config cml1_do_configure }Signature · 1 line
1.7.2.3
Otavio Salvador
Acked-byRe: [PATCH 07/12] busybox: simplify handling of busybox-static
Quoted 6 lines · Bernhard Reutner-Fischer
In the long run, i have already thought about virtualizing busybox into coreutils/util-linux/init/whatnot and use packages and u-a (to handle these opkg-packages natively via
rootfs_opkgand pstaging w/ opkg-cl -O). We now do a real install with the superset of {,-static} each and use u-a to properly set the tools per provider. But anyway. The above was a step. ACK?
Regarding the busybox cleanup a nice way to enable/disable features (and links) on it is an important thing to have. We have sort of it for uclibc (and patches for eglibc has been sent).
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 8/12 busybox: provide -passwd and -shadow packages
In reply to Bernhard Reutner-Fischer--- recipes/busybox/busybox.inc | 28 ++++++++++++++++++++++++++++ recipes/busybox/busybox_1.1x.inc | 2 ++ recipes/busybox/files/passwd | 11 +++++++++++ recipes/busybox/files/shadow | 11 +++++++++++ 4 files changed, 52 insertions(+), 0 deletions(-) create mode 100644 recipes/busybox/files/passwd create mode 100644 recipes/busybox/files/shadow
recipes/busybox/busybox.inc +28 -0
@@ -23,6 +23,8 @@ SRC_URI = "\ file://hwclock-default \ file://ifupdown-spurious-environ.patch \ file://mount.busybox \ + file://passwd \ + file://shadow \ file://syslog \ file://syslog.conf \ file://udhcpscript.patch \
@@ -34,6 +36,7 @@ SRC_URI_append_nylon = " file://xargs-double-size.patch" export EXTRA_CFLAGS = "${CFLAGS}" EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" PACKAGES =+ "${PN}-mountall ${PN}-httpd ${PN}-syslog ${PN}-udhcpd" +PACKAGES =+ "${PN}-passwd ${PN}-shadow" # We need this RRECOMMENDS_${PN} because libc dlopens libgcc # and shlib mechanism can not detect it because its not
@@ -47,6 +50,8 @@ RDEPENDS_${PN} += "${PN}-mountall" RRECOMMENDS_${PN} += "libgcc ${PN}-syslog" FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" +FILES_${PN}-passwd = "${sysconfdir}/passwd.${PN}" +FILES_${PN}-shadow = "${sysconfdir}/shadow.${PN}" FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog.${PN} ${sysconfdir}/syslog.conf" FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
@@ -64,6 +69,8 @@ CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf" INITSCRIPT_PARAMS_${PN}-syslog_slugos = "start 20 ." RDEPENDS_${PN}-httpd += "${PN}" +RDEPENDS_${PN}-passwd += "${PN}" +RDEPENDS_${PN}-shadow += "${PN}-passwd" RDEPENDS_${PN}-syslog += "${PN}" RDEPENDS_${PN}-udhcpd += "${PN}"
@@ -177,6 +184,12 @@ do_install () { fi fi + if grep -q "CONFIG_PASSWD=y" ${WORKDIR}/defconfig; then + install -m 0644 ${WORKDIR}/passwd ${D}${sysconfdir}/passwd.${PN} + if grep -q "CONFIG_FEATURE_SHADOWPASSWDS=y" ${WORKDIR}/defconfig; then + install -m 0640 ${WORKDIR}/shadow ${D}${sysconfdir}/shadow.${PN} + fi + fi if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN} install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
@@ -260,6 +273,21 @@ pkg_prerm_${PN}-mountall () { update-alternatives --remove default_mountall mountall.${PN} } +pkg_postinst_${PN}-passwd () { + update-alternatives --install ${sysconfdir}/passwd default_passwd passwd.${PN} 50 +} +pkg_prerm_${PN}-passwd () { + update-alternatives --remove default_passwd passwd.${PN} +} + +pkg_postinst_${PN}-shadow () { + update-alternatives --install ${sysconfdir}/shadow default_shadow shadow.${PN} 50 +} +pkg_prerm_${PN}-shadow () { + update-alternatives --remove default_shadow shadow.${PN} +} + + pkg_postinst_${PN}-syslog () { update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 50
recipes/busybox/busybox_1.1x.inc +2 -0
@@ -17,6 +17,8 @@ SRC_URI = "\ file://hwclock-default \ file://mount.busybox \ file://mountall \ + file://passwd \ + file://shadow \ file://syslog \ file://syslog.conf \ file://umount.busybox \
recipes/busybox/files/passwd new file +11 -0
@@ -0,0 +1,11 @@ +root:x:0:0:root:/root:/bin/sh +daemon:x:1:1:daemon:/usr/sbin:/bin/sh +bin:x:2:2:bin:/bin:/bin/sh +sys:x:3:3:sys:/dev:/bin/sh +sync:x:4:65534:sync:/bin:/bin/sync +man:x:6:12:man:/var/cache/man:/bin/sh +mail:x:8:8:mail:/var/mail:/bin/sh +www-data:x:33:33:www-data:/var/www:/bin/sh +backup:x:34:34:backup:/var/backups:/bin/sh +irc:x:39:39:ircd:/var/run/ircd:/bin/sh +nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
recipes/busybox/files/shadow new file +11 -0
@@ -0,0 +1,11 @@ +root::14741:0:99999:7::: +daemon:*:14741:0:99999:7::: +bin:*:14741:0:99999:7::: +sys:*:14741:0:99999:7::: +sync:*:14741:0:99999:7::: +man:*:14741:0:99999:7::: +mail:*:14741:0:99999:7::: +www-data:*:14741:0:99999:7::: +backup:*:14741:0:99999:7::: +irc:*:14741:0:99999:7::: +nobody:*:14741:0:99999:7:::
Signature · 1 line
1.7.2.3
Re: [PATCH 08/12] busybox: provide -passwd and -shadow packages
В сообщении от Понедельник 03 января 2011 23:02:02 автор Bernhard Reutner- Fischer написал:
Quoted 9 lines
Signed-off-by Bernhard Reutner-Fischer <[email protected]>--- recipes/busybox/busybox.inc | 28 ++++++++++++++++++++++++++++ recipes/busybox/busybox_1.1x.inc | 2 ++ recipes/busybox/files/passwd | 11 +++++++++++ recipes/busybox/files/shadow | 11 +++++++++++ 4 files changed, 52 insertions(+), 0 deletions(-) create mode 100644 recipes/busybox/files/passwd create mode 100644 recipes/busybox/files/shadow
I don't quite understand why is it needed. We have base-passwd for passwd (and group) and missing shadow usually is not an issue (if my memory serves me right, it'll be created on first usage). Then, speaking of base-passwd that needs to be updated to use alternatives if this goes in.
Signature · 3 lines
http://roman.khimov.ru mailto: [email protected] gpg --keyserver hkp://subkeys.pgp.net --recv-keys 0xE5E055C3
Re: [PATCH 08/12] busybox: provide -passwd and -shadow packages
Quoted 12 lines · Roman I Khimov
В сообщении от Понедельник 03 января 2011 23:02:02 автор Bernhard Reutner- Fischer написал:
Quoted 9 lines
Signed-off-by Bernhard Reutner-Fischer <[email protected]>--- recipes/busybox/busybox.inc | 28 ++++++++++++++++++++++++++++ recipes/busybox/busybox_1.1x.inc | 2 ++ recipes/busybox/files/passwd | 11 +++++++++++ recipes/busybox/files/shadow | 11 +++++++++++ 4 files changed, 52 insertions(+), 0 deletions(-) create mode 100644 recipes/busybox/files/passwd create mode 100644 recipes/busybox/files/shadow
Quoted 4 lines
I don't quite understand why is it needed. We have base-passwd for passwd (and group) and missing shadow usually is not an issue (if my memory serves me right, it'll be created on first usage). Then, speaking of base-passwd that needs to be updated to use alternatives if this goes in.
I intend to use busybox-passwd as replacement for micro-image (will send that as an RFC later tonight). I want micro-image to just contain the bare minimum (and all of it provided by busybox).
PATCH 9/12 busybox: provide postrm for package mdev
In reply to Bernhard Reutner-FischerRemove the mdev runlevel entry on package removal.
--- recipes/busybox/busybox.inc | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
recipes/busybox/busybox.inc +9 -9
@@ -361,16 +361,16 @@ PACKAGES =+ "${PN}-mdev" FILES_${PN}-mdev = "${sysconfdir}/mdev ${sysconfdir}/mdev.conf ${sysconfdir}/init.d/mdev" RDEPENDS_${PN}-mdev += "${PN}" -PACKAGES =+ "${PN}-linuxrc" -FILES_${PN}-linuxrc = "linuxrc" -RDEPENDS_${PN}-linuxrc += "${PN}" - pkg_postinst_${PN}-mdev() { -if test "x$D" != "x"; then - OPT="-r $D" -else - OPT="-s" -fi + [ -n "$D" ] && OPT="-r $D" || OPT="-s" update-rc.d $OPT mdev start 06 S . } +pkg_postrm_${PN}-mdev() { + [ -n "$D" ] && OPT="-r $D" || OPT="-s" + update-rc.d $OPT -f mdev remove +} + +PACKAGES =+ "${PN}-linuxrc" +FILES_${PN}-linuxrc = "linuxrc" +RDEPENDS_${PN}-linuxrc += "${PN}"
Signature · 1 line
1.7.2.3
Re: [PATCH 09/12] busybox: provide postrm for package mdev
В сообщении от Понедельник 03 января 2011 23:02:03 автор Bernhard Reutner- Fischer написал:
recipes/busybox/busybox.inc PACKAGES =+ "${PN}-mdev" · line 365
Quoted 6 lines
recipes/busybox/busybox.inc +1
-5-if test "x$D" != "x"; then - OPT="-r $D" -else - OPT="-s" -fi + [ -n "$D" ] && OPT="-r $D" || OPT="-s"
Looks good except for this part (see other mail).
Signature · 3 lines
http://roman.khimov.ru mailto: [email protected] gpg --keyserver hkp://subkeys.pgp.net --recv-keys 0xE5E055C3
Re: [PATCH 09/12] busybox: provide postrm for package mdev
Keep it simple and stupid!
So I vote for the long, readable and less error prone version.
Regards
Wolfgang Hauser
Quoted 18 lines · Roman I Khimov
В сообщении от Понедельник 03 января 2011 23:02:03 автор Bernhard Reutner- Fischer написал:
recipes/busybox/busybox.inc PACKAGES =+ "${PN}-mdev" · line 365
Quoted 6 lines
recipes/busybox/busybox.inc +1
-5-if test "x$D" != "x"; then - OPT="-r $D" -else - OPT="-s" -fi + [ -n "$D" ] && OPT="-r $D" || OPT="-s"Looks good except for this part (see other mail).
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [PATCH 09/12] busybox: provide postrm for package mdev
Quoted 2 lines · Wolfgang Hauser
Keep it simple and stupid!
So I vote for the long, readable and less error prone version.
I usually prefer the KISS however on this specific case I disagree.
The new code avoid using test and a fork. This allows for "test" applet removal if desired.
I prefer the ugly but more "embedded like" code.
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
Re: [PATCH 09/12] busybox: provide postrm for package mdev
I agree for the test statement, but that may be solved by using ´the brackets in the long statement.
Quoted 11 lines · Otavio Salvador
Quoted 2 lines · Wolfgang Hauser
Keep it simple and stupid!
So I vote for the long, readable and less error prone version.I usually prefer the KISS however on this specific case I disagree.
The new code avoid using test and a fork. This allows for "test" applet removal if desired.
I prefer the ugly but more "embedded like" code.
Re: [PATCH 09/12] busybox: provide postrm for package mdev
Quoted 14 lines · Wolfgang Hauser
I agree for the test statement, but that may be solved by using ´the brackets in the long statement.
Quoted 10 lines · Otavio Salvador
Quoted 2 lines · Wolfgang Hauser
Keep it simple and stupid!
So I vote for the long, readable and less error prone version.I usually prefer the KISS however on this specific case I disagree.
The new code avoid using test and a fork. This allows for "test" applet removal if desired.
I prefer the ugly but more "embedded like" code.
remember that this stuff potentially ends up on the target, so KISS (byte-wise) is always the preferred way. And yes, update-rc.d and the required inode itself is bloat, but heck, if you want online pkg-management you have to take that penalty, FWIW.
So.. Can i please have an explicit ACK for that space-saver?
Otavio Salvador
Acked-byRe: [PATCH 09/12] busybox: provide postrm for package mdev
Quoted 14 lines · Bernhard Reutner-Fischer
Quoted 13 lines · Wolfgang Hauser
I agree for the test statement, but that may be solved by using ´the brackets in the long statement.
Quoted 9 lines · Otavio Salvador
Quoted 2 lines · Wolfgang Hauser
Keep it simple and stupid!
So I vote for the long, readable and less error prone version.I usually prefer the KISS however on this specific case I disagree.
The new code avoid using test and a fork. This allows for "test" applet removal if desired.
Quoted 8 lines
Quoted 1 line
Quoted 1 line
I prefer the ugly but more "embedded like" code.
remember that this stuff potentially ends up on the target, so KISS (byte-wise) is always the preferred way. And yes, update-rc.d and the required inode itself is bloat, but heck, if you want online pkg-management you have to take that penalty, FWIW.
So.. Can i please have an explicit ACK for that space-saver?
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 10/12 busybox: simplify update-rc.d OPT handling
In reply to Bernhard Reutner-Fischerstyle-only change
--- recipes/busybox/busybox.inc | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-)
recipes/busybox/busybox.inc +2 -10
@@ -291,11 +291,7 @@ pkg_prerm_${PN}-shadow () { pkg_postinst_${PN}-syslog () { update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 50 - if test "x$D" != "x"; then - OPT="-r $D" - else - OPT="-s" - fi + [ -n "$D" ] && OPT="-r $D" || OPT="-s" # remove all rc.d-links potentially created from alternative # syslog packages before creating new ones update-rc.d $OPT -f syslog remove
@@ -313,13 +309,9 @@ pkg_prerm_${PN}-syslog () { } pkg_postrm_${PN}-syslog () { - if test "x$D" != "x"; then - OPT="-r $D" - else - OPT="" - fi if test "$1" = "remove" -o "$1" = "purge"; then if ! test -e "/etc/init.d/syslog"; then + [ -n "$D" ] && OPT="-r $D" || OPT="-s" update-rc.d $OPT syslog remove fi fi
Signature · 1 line
1.7.2.3
Re: [PATCH 10/12] busybox: simplify update-rc.d OPT handling
В сообщении от Понедельник 03 января 2011 23:02:04 автор Bernhard Reutner- Fischer написал:
recipes/busybox/busybox.inc pkg_prerm_${PN}-shadow () { · line 294
Quoted 6 lines
recipes/busybox/busybox.inc +1
-5- if test "x$D" != "x"; then - OPT="-r $D" - else - OPT="-s" - fi + [ -n "$D" ] && OPT="-r $D" || OPT="-s"
I have a strong feeling that this is wrong. Yeah, the first one takes up five times more lines but to me it's about five times easier to parse glancing over the recipe.
Also, from what I heard '"x$D" != "x"' tests are the most portable ones.
Signature · 3 lines
http://roman.khimov.ru mailto: [email protected] gpg --keyserver hkp://subkeys.pgp.net --recv-keys 0xE5E055C3
Re: [PATCH 10/12] busybox: simplify update-rc.d OPT handling
Quoted 13 lines · Roman I Khimov
В сообщении от Понедельник 03 января 2011 23:02:04 автор Bernhard Reutner- Fischer написал:
recipes/busybox/busybox.inc pkg_prerm_${PN}-shadow () { · line 294
Quoted 6 lines
recipes/busybox/busybox.inc +1
-5- if test "x$D" != "x"; then - OPT="-r $D" - else - OPT="-s" - fi + [ -n "$D" ] && OPT="-r $D" || OPT="-s"I have a strong feeling that this is wrong. Yeah, the first one takes up five times more lines but to me it's about five times easier to parse glancing over the recipe.
Quoted 1 line
Also, from what I heard '"x$D" != "x"' tests are the most portable ones.
It is more portable, yes. But given that test(1) is required to support both -n and -z even in SUSv3 -- and still is in SUSv4 and i doubt this fact will change anytime soon -- it's sane to assume it works.
ok?
Re: [PATCH 10/12] busybox: simplify update-rc.d OPT handling
In reply to Bernhard Reutner-FischerQuoted 48 lines · Bernhard Reutner-Fischer
style-only change
Signed-off-by Bernhard Reutner-Fischer <[email protected]>---
recipes/busybox/busybox.inc | 12 ++----------1 files changed, 2 insertions(+), 10 deletions(-)recipes/busybox/busybox.inc +0
-0@@ -291,11 +291,7 @@ pkg_prerm_${PN}-shadow () { pkg_postinst_${PN}-syslog () {update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 50
- if test "x$D" != "x"; then
- OPT="-r $D"
- else
- OPT="-s"
- fi
+ [ -n "$D" ] && OPT="-r $D" || OPT="-s"# remove all rc.d-links potentially created from alternative # syslog packages before creating new ones update-rc.d $OPT -f syslog removerecipes/busybox/busybox.inc +0
-5@@ -313,13 +309,9 @@ pkg_prerm_${PN}-syslog () { } pkg_postrm_${PN}-syslog () { - if test "x$D" != "x"; then - OPT="-r $D" - else - OPT="" - fiif test "$1" = "remove" -o "$1" = "purge"; then if ! test -e "
/etc/init.d/syslog"; then
+ [ -n "$D" ] && OPT="-r $D" || OPT="-s" update-rc.d $OPT syslog remove fi
fi
--
1.7.2.3_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
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 11/12 glib-2.0: fix compilation for !IPv6
In reply to Bernhard Reutner-Fischer--- .../glib-2.0/glib-2.0-2.26.1/configure-ipv6.patch | 92 ++++++++++++++++++++ recipes/glib-2.0/glib-2.0_2.26.1.bb | 3 +- 2 files changed, 94 insertions(+), 1 deletions(-) create mode 100644 recipes/glib-2.0/glib-2.0-2.26.1/configure-ipv6.patch
recipes/glib-2.0/glib-2.0-2.26.1/configure-ipv6.patch new file +92 -0
@@ -0,0 +1,92 @@ +From a619a217e3e5aa5345db631213aec5a3684a3001 Mon Sep 17 00:00:00 2001 +Subject: [PATCH] autodetect in6addr_{any,loopback} availability + +Fixes linking error on systems which choose not to support ipv6: +./.libs/libgio-2.0.so: undefined reference to `in6addr_loopback' +./.libs/libgio-2.0.so: undefined reference to `in6addr_any' + +Signed-off-by: Bernhard Reutner-Fischer <[email protected]> +--- + configure.ac | 31 +++++++++++++++++++++++++++++++ + gio/ginetaddress.c | 16 ++++++++++++++-- + 2 files changed, 45 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7114014..023db49 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1019,6 +1019,37 @@ if test $glib_native_win32 = no; then + AC_SUBST(LIBASYNCNS_LIBADD) + fi + ++dnl handle --disable-ipv6 ++AC_ARG_ENABLE(ipv6, AC_HELP_STRING([--disable-ipv6],[Disable IPv6 support])) ++if test "$ipv6" != "no"; then ++ AC_DEFINE(HAVE_IPV6, 1, [Define if IPv6 is available]) ++ ++ AC_MSG_CHECKING([for struct in6addr_any]) ++ AC_TRY_LINK( ++ [#define IN_AUTOCONF ++ #include <sys/types.h> ++ #include <sys/socket.h> ++ #include <netinet/in.h>], ++ [struct in6_addr a = in6addr_any; ++ return a.s6_addr[0];], ++ [AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_IN6ADDR_ANY, 1, [Define if in6addr_any is available])], ++ [AC_MSG_RESULT(no)] ++ ) ++ AC_MSG_CHECKING([for struct in6addr_loopback]) ++ AC_TRY_LINK( ++ [#define IN_AUTOCONF ++ #include <sys/types.h> ++ #include <sys/socket.h> ++ #include <netinet/in.h>], ++ [struct in6_addr a = in6addr_loopback; ++ return a.s6_addr[0];], ++ [AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_IN6ADDR_LOOPBACK, 1, [Define if in6addr_loopback is available])], ++ [AC_MSG_RESULT(no)] ++ ) ++fi ++ + case $host in + *-*-solaris* ) + AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris) +diff --git a/gio/ginetaddress.c b/gio/ginetaddress.c +index 0f67e4f..ed29be2 100644 +--- a/gio/ginetaddress.c ++++ b/gio/ginetaddress.c +@@ -484,7 +484,13 @@ g_inet_address_new_loopback (GSocketFamily family) + return g_inet_address_new_from_bytes (addr, family); + } + else +- return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family); ++ { ++#ifdef HAVE_IN6ADDR_LOOPBACK ++ return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family); ++#else ++ return NULL; ++#endif ++ } + } + + /** +@@ -511,7 +517,13 @@ g_inet_address_new_any (GSocketFamily family) + return g_inet_address_new_from_bytes (addr, family); + } + else +- return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family); ++ { ++#ifdef HAVE_IN6ADDR_ANY ++ return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family); ++#else ++ return NULL; ++#endif ++ } + } + + +-- +1.7.2.3 +
recipes/glib-2.0/glib-2.0_2.26.1.bb +2 -1
@@ -10,7 +10,7 @@ DEPENDS = "glib-2.0-native gtk-doc zlib" DEPENDS_virtclass-native = "gettext-native gtk-doc-native \ pkgconfig-native" -PR = "r2" +PR = "r3" SRC_URI = "\ http://ftp.gnome.org/pub/GNOME/sources/glib/2.26/glib-${PV}.tar.bz2;name=archive \
@@ -21,6 +21,7 @@ SRC_URI = "\ file://60_wait-longer-for-threads-to-die.patch \ file://glib-mkenums-interpreter.patch \ file://libglib2-fix-compilation-with-no-builtin-atomic.patch \ + file://configure-ipv6.patch \ " SRC_URI[archive.md5sum] = "17535accceef55bcb17a74d73f9c2aef"
Signature · 1 line
1.7.2.3
PATCH 12/12 xz: bump version
In reply to Bernhard Reutner-Fischer--- recipes/xz/xz.inc | 1 + recipes/xz/xz_4.999.9beta.bb | 5 ----- recipes/xz/xz_5.0.0.bb | 5 +++++ 3 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 recipes/xz/xz_4.999.9beta.bb create mode 100644 recipes/xz/xz_5.0.0.bb
recipes/xz/xz.inc +1 -0
@@ -1,6 +1,7 @@ DESCRIPTION = "XZ Utils is free general-purpose data compression software with high compression ratio. XZ Utils are the successor to LZMA Utils." SECTION = "console/utils" LICENSE = "Public Domain" +HOMEPAGE = "http://tukaani.org/xz/" INC_PR = "r0" S ?= "${WORKDIR}/xz-${PV}" EXTRA_OECONF = "--enable-shared"
recipes/xz/xz_4.999.9beta.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require xz.inc -PR = "${INC_PR}.0" -SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.bz2;name=xz" -SRC_URI[xz.md5sum] = "cc4044fcc073b8bcf3164d1d0df82161" -SRC_URI[xz.sha256sum] = "330312c4397608d8b7be362cc7edbfeafa6101614bc2164d816ea767656aa15c"
recipes/xz/xz_5.0.0.bb new file +5 -0
@@ -0,0 +1,5 @@ +require xz.inc +PR = "${INC_PR}.0" +SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.bz2" +SRC_URI[md5sum] = "0652c09fdbb93ae2ce78c1368ffda612" +SRC_URI[sha256sum] = "47a89e65c4690364a0123871a221e663d23a9fbd1ca756a804b10dd4006056d8"
Signature · 1 line
1.7.2.3
Re: [PATCH 12/12] xz: bump version
ping?
A follow-up could also
recipes/xz/xz.inc +1 -1
@@ -4,7 +4,7 @@ LICENSE = "Public Domain" HOMEPAGE = "http://tukaani.org/xz/" INC_PR = "r0" S ?= "${WORKDIR}/xz-${PV}" -EXTRA_OECONF = "--enable-shared" +EXTRA_OECONF = "--enable-shared --enable-small --disable-lzma-links" BBCLASSEXTEND = "native" inherit autotools
but that's for another day..
Quoted 46 lines · Bernhard Reutner-Fischer
Signed-off-by Bernhard Reutner-Fischer <[email protected]>---
recipes/xz/xz.inc | 1 + recipes/xz/xz_4.999.9beta.bb | 5 ----- recipes/xz/xz_5.0.0.bb | 5 +++++ 3 files changed, 6 insertions(+), 5 deletions(-)delete mode 100644 recipes/xz/xz_4.999.9beta.bb
create mode 100644 recipes/xz/xz_5.0.0.bbrecipes/xz/xz.inc +0
-0@@ -1,6 +1,7 @@DESCRIPTION = "XZ Utils is free general-purpose data compression software with high compression ratio. XZ Utils are the successor to LZMA Utils." SECTION = "console/utils"
LICENSE = "Public Domain"
+HOMEPAGE = "http://tukaani.org/xz/"INC_PR= "r0"
S ?= "${WORKDIR}/xz-${PV}"EXTRA_OECONF= "--enable-shared"recipes/xz/xz_4.999.9beta.bb deleted +0
-5@@ -1,5 +0,0 @@ -require xz.inc -PR = "${INC_PR}.0" -SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.bz2;name=xz" -SRC_URI[xz.md5sum] = "cc4044fcc073b8bcf3164d1d0df82161" -SRC_URI[xz.sha256sum] = "330312c4397608d8b7be362cc7edbfeafa6101614bc2164d816ea767656aa15c"recipes/xz/xz_5.0.0.bb new file +5
-0@@ -0,0 +1,5 @@ +require xz.inc +PR = "${INC_PR}.0" +SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.bz2" +SRC_URI[md5sum] = "0652c09fdbb93ae2ce78c1368ffda612" +SRC_URI[sha256sum] = "47a89e65c4690364a0123871a221e663d23a9fbd1ca756a804b10dd4006056d8"Signature · 1 line
1.7.2.3
Re: [PATCH 12/12] xz: bump version
Quoted 2 lines · Bernhard Reutner-Fischer
ping?
You should check the repo. This patch was pushed with my sign offs now I have pushed this update as well
Thanks
-Khem
Quoted 69 lines
A follow-up could also
recipes/xz/xz.inc +1
-1@@ -4,7 +4,7 @@ LICENSE = "Public Domain" HOMEPAGE = "http://tukaani.org/xz/" INC_PR = "r0" S ?= "${WORKDIR}/xz-${PV}" -EXTRA_OECONF = "--enable-shared" +EXTRA_OECONF = "--enable-shared --enable-small --disable-lzma-links" BBCLASSEXTEND = "native" inherit autotoolsbut that's for another day..
Quoted 44 lines · Bernhard Reutner-Fischer
Signed-off-by Bernhard Reutner-Fischer<[email protected]>---
recipes/xz/xz.inc | 1 + recipes/xz/xz_4.999.9beta.bb | 5 ----- recipes/xz/xz_5.0.0.bb | 5 +++++ 3 files changed, 6 insertions(+), 5 deletions(-)delete mode 100644 recipes/xz/xz_4.999.9beta.bb
create mode 100644 recipes/xz/xz_5.0.0.bbrecipes/xz/xz.inc +0
-0@@ -1,6 +1,7 @@DESCRIPTION = "XZ Utils is free general-purpose data compression software with high compression ratio. XZ Utils are the successor to LZMA Utils." SECTION = "console/utils"
LICENSE = "Public Domain"
+HOMEPAGE = "http://tukaani.org/xz/"INC_PR= "r0"
S ?= "${WORKDIR}/xz-${PV}"EXTRA_OECONF= "--enable-shared"recipes/xz/xz_4.999.9beta.bb deleted +0
-5@@ -1,5 +0,0 @@ -require xz.inc -PR = "${INC_PR}.0" -SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.bz2;name=xz" -SRC_URI[xz.md5sum] = "cc4044fcc073b8bcf3164d1d0df82161" -SRC_URI[xz.sha256sum] = "330312c4397608d8b7be362cc7edbfeafa6101614bc2164d816ea767656aa15c"recipes/xz/xz_5.0.0.bb new file +5
-1@@ -0,0 +1,5 @@ +require xz.inc +PR = "${INC_PR}.0" +SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.bz2" +SRC_URI[md5sum] = "0652c09fdbb93ae2ce78c1368ffda612" +SRC_URI[sha256sum] = "47a89e65c4690364a0123871a221e663d23a9fbd1ca756a804b10dd4006056d8" --Quoted 2 lines
1.7.2.3
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
2011/1/3 Bernhard Reutner-Fischer <[email protected]>:
Quoted 3 lines
/RRECOMENDS/s/COM/COMM/
Signed-off-by Bernhard Reutner-Fischer <[email protected]>
Quoted 26 lines
---
recipes/gstd/gstd_git.bb | 2 +-1 files changed, 1 insertions(+), 1 deletions(-)recipes/gstd/gstd_git.bb +0
-0@@ -25,7 +25,7 @@ do_configure() { }RDEPENDS_${PN} = "dbus dbus-glib gstreamer gst-plugins-base"
recipes/gstd/gstd_git.bb +1
-1-RRECOMENDS_${PN} = "gstreamer-ti" +RRECOMMENDS_${PN} = "gstreamer-ti"FILES_${PN} += "${datadir}/dbus-1/*/*.service" FILES_${PN}-dev += "${datadir}/dbus-1/interfaces/*.xml" --
1.7.2.3_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 12 lines · Bernhard Reutner-Fischer
/RRECOMENDS/s/COM/COMM/
Signed-off-by Bernhard Reutner-Fischer <[email protected]>--- recipes/gstd/gstd_git.bb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)recipes/gstd/gstd_git.bb +0
-0
recipes/gstd/gstd_git.bb do_configure() { · line 28
Quoted 5 lines
recipes/gstd/gstd_git.bb +1
-1@@ -25,7 +25,7 @@ do_configure() { } RDEPENDS_${PN} = "dbus dbus-glib gstreamer gst-plugins-base" -RRECOMENDS_${PN} = "gstreamer-ti" +RRECOMMENDS_${PN} = "gstreamer-ti"
Such changes require a PR bump
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFNIi6NMkyGM64RGpERAtRuAJ9gDfwcyVvBpqU1nuKonGb/6I8fyQCfXOEd BO/iH4J7dGPQdTChKgNWT3o=
=0DBK
-----END PGP SIGNATURE-----
Quoted 15 lines · Koen Kooi
Quoted 14 lines · Bernhard Reutner-Fischer
/RRECOMENDS/s/COM/COMM/
Signed-off-by Bernhard Reutner-Fischer <[email protected]>--- recipes/gstd/gstd_git.bb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)recipes/gstd/gstd_git.bb +0
-0@@ -25,7 +25,7 @@ do_configure() { }
Quoted 5 lines
recipes/gstd/gstd_git.bb do_configure() { · line 28
Quoted 3 lines
recipes/gstd/gstd_git.bb +1
-1RDEPENDS_${PN} = "dbus dbus-glib gstreamer gst-plugins-base" -RRECOMENDS_${PN} = "gstreamer-ti" +RRECOMMENDS_${PN} = "gstreamer-ti"Such changes require a PR bump
so i'll leave that to whoever actually uses it. Retracted.
В сообщении от Понедельник 03 января 2011 23:01:55 автор Bernhard Reutner- Fischer написал:
Quoted 1 line
gstd: fix type in RRECOMENDS
s/type/typo/
maybe?
Signature · 3 lines
http://roman.khimov.ru mailto: [email protected] gpg --keyserver hkp://subkeys.pgp.net --recv-keys 0xE5E055C3