diff options
Diffstat (limited to 'recipes')
19 files changed, 206 insertions, 282 deletions
diff --git a/recipes/coreutils/coreutils-6.0.inc b/recipes/coreutils/coreutils-6.0.inc new file mode 100644 index 0000000000..0dd2512021 --- /dev/null +++ b/recipes/coreutils/coreutils-6.0.inc @@ -0,0 +1,7 @@ +require coreutils.inc + +SRC_URI = "\ + ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ + file://futimens.patch;patch=1 \ + file://coreutils-install-use-STRIP.patch;patch=1 \ +" diff --git a/recipes/coreutils/coreutils-7.1.inc b/recipes/coreutils/coreutils-7.1.inc new file mode 100644 index 0000000000..7f77b9b1ca --- /dev/null +++ b/recipes/coreutils/coreutils-7.1.inc @@ -0,0 +1,6 @@ +require coreutils.inc + +SRC_URI = "ftp://ftp.gnu.org/gnu/coreutils/coreutils-${PV}.tar.gz" + +# not thoroughly tested yet +DEFAULT_PREFERENCE = "-1" diff --git a/recipes/coreutils/coreutils-7.2.inc b/recipes/coreutils/coreutils-7.2.inc new file mode 100644 index 0000000000..7ab42213c9 --- /dev/null +++ b/recipes/coreutils/coreutils-7.2.inc @@ -0,0 +1,4 @@ +require coreutils.inc + +SRC_URI = "ftp://ftp.gnu.org/gnu/coreutils/coreutils-${PV}.tar.gz \ + file://coreutils-7.2-fix-sort-segfault.patch;patch=1" diff --git a/recipes/coreutils/coreutils-native_6.0.bb b/recipes/coreutils/coreutils-native_6.0.bb index a3754df123..800aacc568 100644 --- a/recipes/coreutils/coreutils-native_6.0.bb +++ b/recipes/coreutils/coreutils-native_6.0.bb @@ -1,5 +1,4 @@ -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}" -S = "${WORKDIR}/coreutils-${PV}" - -require coreutils_${PV}.bb +require coreutils-${PV}.inc require coreutils-native.inc + +PR = "r4" diff --git a/recipes/coreutils/coreutils-native_7.1.bb b/recipes/coreutils/coreutils-native_7.1.bb index a3754df123..6370c04ef7 100644 --- a/recipes/coreutils/coreutils-native_7.1.bb +++ b/recipes/coreutils/coreutils-native_7.1.bb @@ -1,5 +1,4 @@ -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}" -S = "${WORKDIR}/coreutils-${PV}" - -require coreutils_${PV}.bb +require coreutils-${PV}.inc require coreutils-native.inc + +PR = "r1" diff --git a/recipes/coreutils/coreutils-native_7.2.bb b/recipes/coreutils/coreutils-native_7.2.bb index a3754df123..6370c04ef7 100644 --- a/recipes/coreutils/coreutils-native_7.2.bb +++ b/recipes/coreutils/coreutils-native_7.2.bb @@ -1,5 +1,4 @@ -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}" -S = "${WORKDIR}/coreutils-${PV}" - -require coreutils_${PV}.bb +require coreutils-${PV}.inc require coreutils-native.inc + +PR = "r1" diff --git a/recipes/coreutils/coreutils-target.inc b/recipes/coreutils/coreutils-target.inc new file mode 100644 index 0000000000..1dd1d369f3 --- /dev/null +++ b/recipes/coreutils/coreutils-target.inc @@ -0,0 +1,82 @@ +EXTRA_AUTORECONF += "-I ${S}/m4" +SRC_URI += "file://onceonly.m4" + +# [ gets a special treatment and is not included in this +bindir_progs = "basename cksum comm csplit cut df dir dircolors dirname du \ + env expand expr factor fmt fold groups head hostid id install \ + join link logname md5sum mkfifo nice nl nohup od paste pathchk \ + pinky pr printenv printf ptx readlink seq sha1sum shred sort \ + split stat sum tac tail tee test tr tsort tty unexpand uniq \ + unlink users vdir wc who whoami yes \ + " + +# hostname gets a special treatment and is not included in this +base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill \ + ln ls mkdir mknod mv pwd rm rmdir sleep stty sync touch \ + true uname \ + " + +sbindir_progs= "chroot" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/onceonly.m4 ${S}/m4 +} + +do_install () { + autotools_do_install + + # Renaming the utilities that should go in /usr/bin + for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done + + # Renaming and moving the utilities that should go in /bin (FHS) + install -d ${D}${base_bindir} + for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done + + # Renaming and moving the utilities that should go in /usr/sbin (FHS) + install -d ${D}${sbindir} + for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done + + # [ requires special handling because [.coreutils will cause the sed stuff + # in update-alternatives to fail, therefore use lbracket - the name used + # for the actual source file. + mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN} + # hostname and uptime separated. busybox's versions are preferred + if [ -e ${D}${bindir}/hostname ]; then + mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN} + fi + if [ -e ${D}${bindir}/uptime ]; then + mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} + fi +} + +pkg_postinst_${PN} () { + # The utilities in /usr/bin + for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done + + # The utilities in /bin + for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done + + # The utilities in /usr/sbin + for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done + + # Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately. + update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10 + update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10 + update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100 +} + +pkg_prerm_${PN} () { + # The utilities in /usr/bin + for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done + + # The utilities in /bin + for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done + + # The utilities in /usr/sbin + for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done + + # The special cases + update-alternatives --remove hostname hostname.${PN} + update-alternatives --remove uptime uptime.${PN} + update-alternatives --remove '[' 'lbracket.${PN}' +} diff --git a/recipes/coreutils/coreutils_6.0.bb b/recipes/coreutils/coreutils_6.0.bb index d0d082bc63..009dad34cf 100644 --- a/recipes/coreutils/coreutils_6.0.bb +++ b/recipes/coreutils/coreutils_6.0.bb @@ -1,89 +1,9 @@ -require coreutils.inc +require coreutils-${PV}.inc +require coreutils-target.inc PR = "r3" -SRC_URI = "\ - ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ +SRC_URI += "\ file://man.patch;patch=1 \ file://oe-old-tools.patch;patch=1 \ - file://futimens.patch;patch=1 \ - file://coreutils-install-use-STRIP.patch;patch=1 \ - file://onceonly.m4 \ " - -# [ gets a special treatment and is not included in this -bindir_progs = "basename cksum comm csplit cut df dir dircolors dirname du \ - env expand expr factor fmt fold groups head hostid id install \ - join link logname md5sum mkfifo nice nl nohup od paste pathchk \ - pinky pr printenv printf ptx readlink seq sha1sum shred sort \ - split stat sum tac tail tee test tr tsort tty unexpand uniq \ - unlink users vdir wc who whoami yes \ - " - -# hostname gets a special treatment and is not included in this -base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill \ - ln ls mkdir mknod mv pwd rm rmdir sleep stty sync touch \ - true uname \ - " - -sbindir_progs= "chroot" - -do_configure_prepend() { - install -m 0644 ${WORKDIR}/onceonly.m4 ${S}/m4 -} - -do_install () { - autotools_do_install - - # Renaming the utilities that should go in /usr/bin - for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done - - # Renaming and moving the utilities that should go in /bin (FHS) - install -d ${D}${base_bindir} - for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done - - # Renaming and moving the utilities that should go in /usr/sbin (FHS) - install -d ${D}${sbindir} - for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done - - # [ requires special handling because [.coreutils will cause the sed stuff - # in update-alternatives to fail, therefore use lbracket - the name used - # for the actual source file. - mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN} - # hostname and uptime separated. busybox's versions are preferred - mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN} - mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} - -} - -pkg_postinst_${PN} () { - # The utilities in /usr/bin - for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done - - # The utilities in /bin - for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done - - # The utilities in /usr/sbin - for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done - - # Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately. - update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10 - update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10 - update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100 -} - -pkg_prerm_${PN} () { - # The utilities in /usr/bin - for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done - - # The utilities in /bin - for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done - - # The utilities in /usr/sbin - for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done - - # The special cases - update-alternatives --remove hostname hostname.${PN} - update-alternatives --remove uptime uptime.${PN} - update-alternatives --remove '[' 'lbracket.${PN}' -} diff --git a/recipes/coreutils/coreutils_7.1.bb b/recipes/coreutils/coreutils_7.1.bb index 6488e11a79..18ee4e36e1 100644 --- a/recipes/coreutils/coreutils_7.1.bb +++ b/recipes/coreutils/coreutils_7.1.bb @@ -1,92 +1,7 @@ -require coreutils.inc -PR = "r0" +require coreutils-${PV}.inc +require coreutils-target.inc -# not thoroughly testes yet -DEFAULT_PREFERENCE = "-1" +PR = "r0.1" -SRC_URI = "\ - ftp://ftp.gnu.org/gnu/coreutils/coreutils-${PV}.tar.gz \ - file://automake-version.patch;patch=1 \ - file://man.patch;patch=1 \ - file://onceonly.m4 \ -" - -# [ gets a special treatment and is not included in this -bindir_progs = "basename cksum comm csplit cut df dir dircolors dirname du \ - env expand expr factor fmt fold groups head hostid id install \ - join link logname md5sum mkfifo nice nl nohup od paste pathchk \ - pinky pr printenv printf ptx readlink seq sha1sum shred sort \ - split stat sum tac tail tee test tr tsort tty unexpand uniq \ - unlink users vdir wc who whoami yes \ - " - -# hostname gets a special treatment and is not included in this -base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill \ - ln ls mkdir mknod mv pwd rm rmdir sleep stty sync touch \ - true uname \ - " - -sbindir_progs= "chroot" - -do_configure_prepend() { - install -m 0644 ${WORKDIR}/onceonly.m4 ${S}/m4 -} - -do_install () { - autotools_do_install - - # Renaming the utilities that should go in /usr/bin - for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done - - # Renaming and moving the utilities that should go in /bin (FHS) - install -d ${D}${base_bindir} - for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done - - # Renaming and moving the utilities that should go in /usr/sbin (FHS) - install -d ${D}${sbindir} - for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done - - # [ requires special handling because [.coreutils will cause the sed stuff - # in update-alternatives to fail, therefore use lbracket - the name used - # for the actual source file. - mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN} - # hostname and uptime separated. busybox's versions are preferred - if [ -e ${D}${bindir}/hostname ]; then - mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN} - fi - if [ -e ${D}${bindir}/uptime ]; then - mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} - fi -} - -pkg_postinst_${PN} () { - # The utilities in /usr/bin - for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done - - # The utilities in /bin - for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done - - # The utilities in /usr/sbin - for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done - - # Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately. - update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10 - update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10 - update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100 -} - -pkg_prerm_${PN} () { - # The utilities in /usr/bin - for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done - - # The utilities in /bin - for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done - - # The utilities in /usr/sbin - for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done - - # The special cases - update-alternatives --remove hostname hostname.${PN} - update-alternatives --remove uptime uptime.${PN} - update-alternatives --remove '[' 'lbracket.${PN}' -} +SRC_URI += "file://automake-version.patch;patch=1 \ + file://man.patch;patch=1" diff --git a/recipes/coreutils/coreutils_7.2.bb b/recipes/coreutils/coreutils_7.2.bb index f80921a288..46333be148 100644 --- a/recipes/coreutils/coreutils_7.2.bb +++ b/recipes/coreutils/coreutils_7.2.bb @@ -1,89 +1,7 @@ -require coreutils.inc +require coreutils-${PV}.inc +require coreutils-target.inc -SRC_URI = "\ - ftp://ftp.gnu.org/gnu/coreutils/coreutils-${PV}.tar.gz \ - file://automake-version.patch;patch=1 \ - file://man.patch;patch=1 \ - file://coreutils-7.2-fix-sort-segfault.patch;patch=1 \ - file://onceonly.m4 \ -" +PR = "r0" -# [ gets a special treatment and is not included in this -bindir_progs = "basename cksum comm csplit cut df dir dircolors dirname du \ - env expand expr factor fmt fold groups head hostid id install \ - join link logname md5sum mkfifo nice nl nohup od paste pathchk \ - pinky pr printenv printf ptx readlink seq sha1sum shred sort \ - split stat sum tac tail tee test tr tsort tty unexpand uniq \ - unlink users vdir wc who whoami yes \ - " - -# hostname gets a special treatment and is not included in this -base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill \ - ln ls mkdir mknod mv pwd rm rmdir sleep stty sync touch \ - true uname \ - " - -sbindir_progs= "chroot" - -do_configure_prepend() { - install -m 0644 ${WORKDIR}/onceonly.m4 ${S}/m4 -} - -do_install () { - autotools_do_install - - # Renaming the utilities that should go in /usr/bin - for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done - - # Renaming and moving the utilities that should go in /bin (FHS) - install -d ${D}${base_bindir} - for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done - - # Renaming and moving the utilities that should go in /usr/sbin (FHS) - install -d ${D}${sbindir} - for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done - - # [ requires special handling because [.coreutils will cause the sed stuff - # in update-alternatives to fail, therefore use lbracket - the name used - # for the actual source file. - mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN} - # hostname and uptime separated. busybox's versions are preferred - if [ -e ${D}${bindir}/hostname ]; then - mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN} - fi - if [ -e ${D}${bindir}/uptime ]; then - mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} - fi -} - -pkg_postinst_${PN} () { - # The utilities in /usr/bin - for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done - - # The utilities in /bin - for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done - - # The utilities in /usr/sbin - for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done - - # Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately. - update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10 - update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10 - update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100 -} - -pkg_prerm_${PN} () { - # The utilities in /usr/bin - for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done - - # The utilities in /bin - for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done - - # The utilities in /usr/sbin - for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done - - # The special cases - update-alternatives --remove hostname hostname.${PN} - update-alternatives --remove uptime uptime.${PN} - update-alternatives --remove '[' 'lbracket.${PN}' -} +SRC_URI += "file://automake-version.patch;patch=1 \ + file://man.patch;patch=1" diff --git a/recipes/iptables/iptables-1.4.6/netfilter_remove_ipt_DSCP.patch b/recipes/iptables/iptables-1.4.6/netfilter_remove_ipt_DSCP.patch new file mode 100644 index 0000000000..b833237c16 --- /dev/null +++ b/recipes/iptables/iptables-1.4.6/netfilter_remove_ipt_DSCP.patch @@ -0,0 +1,28 @@ +Index: iptables-1.4.6/include/linux/netfilter_ipv4/ipt_ECN.h +=================================================================== +--- iptables-1.4.6.orig/include/linux/netfilter_ipv4/ipt_ECN.h 2009-12-15 22:05:04.713075521 -0800 ++++ iptables-1.4.6/include/linux/netfilter_ipv4/ipt_ECN.h 2009-12-15 22:08:43.875470318 -0800 +@@ -8,9 +8,6 @@ + */ + #ifndef _IPT_ECN_TARGET_H + #define _IPT_ECN_TARGET_H +-#include <linux/netfilter_ipv4/ipt_DSCP.h> +- +-#define IPT_ECN_IP_MASK (~IPT_DSCP_MASK) + + #define IPT_ECN_OP_SET_IP 0x01 /* set ECN bits of IPv4 header */ + #define IPT_ECN_OP_SET_ECE 0x10 /* set ECE bit of TCP header */ +Index: iptables-1.4.6/include/linux/netfilter_ipv4/ipt_ecn.h +=================================================================== +--- iptables-1.4.6.orig/include/linux/netfilter_ipv4/ipt_ecn.h 2009-12-15 22:09:44.415445160 -0800 ++++ iptables-1.4.6/include/linux/netfilter_ipv4/ipt_ecn.h 2009-12-15 22:09:58.523715835 -0800 +@@ -8,9 +8,6 @@ + */ + #ifndef _IPT_ECN_H + #define _IPT_ECN_H +-#include <linux/netfilter_ipv4/ipt_dscp.h> +- +-#define IPT_ECN_IP_MASK (~IPT_DSCP_MASK) + + #define IPT_ECN_OP_MATCH_IP 0x01 + #define IPT_ECN_OP_MATCH_ECE 0x10 diff --git a/recipes/iptables/iptables.inc b/recipes/iptables/iptables.inc index 4868abb8ee..fd16f97b0a 100644 --- a/recipes/iptables/iptables.inc +++ b/recipes/iptables/iptables.inc @@ -6,24 +6,27 @@ LICENSE = "GPL" SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2" S = "${WORKDIR}/iptables-${PV}" +INC_PR = "r5" + PARALLEL_MAKE = "" export COPT_FLAGS = "${CFLAGS}" export KERNEL_DIR = "${STAGING_INCDIR}" -do_compile () { - unset CFLAGS - oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} NO_SHARED_LIBS=1 -} +inherit autotools + +#do_compile () { +# oe_runmake DESTDIR=${D} NO_SHARED_LIBS=1 +#} -do_install () { - unset CFLAGS - oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1 -} +#do_install () { +# oe_runmake DESTDIR=${D} install NO_SHARED_LIBS=1 +#} PACKAGES =+ "${PN}-utils" FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore" FILES_${PN}-doc += "${mandir}" +FILES_${PN}-dbg += "${libexecdir}/xtables" RRECOMMENDS = "\ kernel-module-ip-tables \ diff --git a/recipes/iptables/iptables_1.3.8.bb b/recipes/iptables/iptables_1.3.8.bb index 520e33624d..47c5564997 100644 --- a/recipes/iptables/iptables_1.3.8.bb +++ b/recipes/iptables/iptables_1.3.8.bb @@ -1,5 +1,5 @@ require iptables.inc -PR = "r5" +PR = "${INC_PR}.0" SRC_URI += "\ file://getsockopt-failed.patch;patch=1 \ diff --git a/recipes/iptables/iptables_1.4.6.bb b/recipes/iptables/iptables_1.4.6.bb new file mode 100644 index 0000000000..433114ef87 --- /dev/null +++ b/recipes/iptables/iptables_1.4.6.bb @@ -0,0 +1,6 @@ +require iptables.inc +PR = "${INC_PR}.0" + +SRC_URI += "\ + file://netfilter_remove_ipt_DSCP.patch;patch=1 \ + " diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.32/export_sa_family_t.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.32/export_sa_family_t.patch new file mode 100644 index 0000000000..3c8137f2de --- /dev/null +++ b/recipes/linux-libc-headers/linux-libc-headers-2.6.32/export_sa_family_t.patch @@ -0,0 +1,22 @@ +diff --git a/include/linux/socket.h b/include/linux/socket.h +index 7b3aae2..ade87cf 100644 +--- a/include/linux/socket.h ++++ b/include/linux/socket.h +@@ -16,6 +16,8 @@ struct __kernel_sockaddr_storage { + /* _SS_MAXSIZE value minus size of ss_family */ + } __attribute__ ((aligned(_K_SS_ALIGNSIZE))); /* force desired alignment */ + ++typedef unsigned short sa_family_t; ++ + #ifdef __KERNEL__ + + #include <asm/socket.h> /* arch-dependent defines */ +@@ -34,8 +36,6 @@ extern void socket_seq_show(struct seq_file *seq); + # endif + #endif /* __KERNEL__ */ + +-typedef unsigned short sa_family_t; +- + /* + * 1003.1g requires sa_family_t and that sa_data is char. + */ diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb index 6e1fdb0996..4b98f055a4 100644 --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb @@ -7,6 +7,7 @@ PR = "r0" DEFAULT_PREFERENCE = "-1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ + file://export_sa_family_t.patch;patch=1 \ " S = "${WORKDIR}/linux-${PV}" diff --git a/recipes/qemu/qemu-0.10.3/fix_fortify_source_compilation.patch b/recipes/qemu/qemu-0.10.3/fix_fortify_source_compilation.patch new file mode 100644 index 0000000000..326d197167 --- /dev/null +++ b/recipes/qemu/qemu-0.10.3/fix_fortify_source_compilation.patch @@ -0,0 +1,13 @@ +--- qemu-0.10.3/block-vvfat.c.orig 2009-05-01 21:02:44 +0400 ++++ qemu-0.10.3/block-vvfat.c 2009-12-15 22:06:04 +0300 +@@ -865,7 +865,9 @@ + { + direntry_t* entry=array_get_next(&(s->directory)); + entry->attributes=0x28; /* archive | volume label */ +- snprintf((char*)entry->name,11,"QEMU VVFAT"); ++ /* snprintf((char*)entry->name,11,"QEMU VVFAT"); */ ++ snprintf(entry->name, sizeof(entry->name), "QEMU VV"); ++ snprintf(entry->extension, sizeof(entry->extension), "FAT"); + } + + /* Now build FAT, and write back information into directory */ diff --git a/recipes/qemu/qemu_0.10.3.bb b/recipes/qemu/qemu_0.10.3.bb index f65f60decd..182f4b4407 100644 --- a/recipes/qemu/qemu_0.10.3.bb +++ b/recipes/qemu/qemu_0.10.3.bb @@ -22,6 +22,7 @@ SRC_URI = "\ file://fix_segfault.patch;patch=1 \ file://no-strip.patch;patch=1 \ file://fix_baum_c_compilation.patch;patch=1 \ + file://fix_fortify_source_compilation.patch;patch=1 \ " S = "${WORKDIR}/qemu-${PV}" diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index 4b3e764d5e..66e78e057f 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Feed" -PR = "r29" +PR = "r30" PV = "1.0" LICENSE = "GPL" @@ -63,6 +63,7 @@ RDEPENDS_${PN} += "\ edje-viewer \ # obexpush \ # obexftp \ + obex-data-server \ mtpaint \ telepathy-python \ intone-video \ |