Package Upgrades
v4 cover Package Upgrades
* iputils: Removed obsolete patches
* elfutils: license changed to GPLv3
several patches were absolete so I removed them
redhat-portability & redhat-robustify backported from latest elfutils-portability & elfutils-robustify from upstream
* The rest are basic upgrades, no issues
The following changes since commit 8a186a6b3853fc1a7dcf342d421c8926c38949c9:
bitbake: hob: save button from settings called a nonexisting method (2013-07-03 08:13:35 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib rmoisan/branch-updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=rmoisan/branch-updates
Radu Moisan (9):
iputils: Upgrade to v20121221
elfutils: Upgrade to v0.155
rxvt-unicode: Upgrade to v9.18
ed: Upgrade to v1.8
libdmx: Upgrade to v1.1.3
apr: Upgrade to v1.4.8
apr-util: Upgrade to v1.5.2
diffutils: Upgrade to v3.3
usbutils: Upgrade to v007
.../usbutils/{usbutils_006.bb => usbutils_007.bb} | 5 +-
.../elfutils/elfutils-0.155/arm_backend.diff | 450 +++++
.../elfutils/elfutils-0.155/do-autoreconf.diff | 215 +++
.../elfutils/elfutils-0.155/dso-link-change.patch | 32 +
.../elfutils/elfutils-0.155/elf_additions.diff | 61 +
.../elfutils-ar-c-fix-num-passed-to-memset.patch | 23 +
.../elfutils-0.155/elfutils-robustify.patch | 1756 +++++++++++++++++++
.../elfutils/elfutils-0.155/hppa_backend.diff | 796 +++++++++
.../elfutils/elfutils-0.155/i386_dis.h | 1657 ++++++++++++++++++
.../elfutils/elfutils-0.155/m68k_backend.diff | 303 ++++
.../elfutils/elfutils-0.155/mempcpy.patch | 24 +
.../elfutils/elfutils-0.155/mips_backend.diff | 708 ++++++++
...ssed-to-snprintf-for-invalid-sh_name-case.patch | 27 +
.../elfutils-0.155/redhat-portability.diff | 1775 +++++++++++++++++++
.../elfutils/elfutils-0.155/redhat-robustify.diff | 1824 ++++++++++++++++++++
.../elfutils/elfutils-0.155/uclibc-support.patch | 91 +
.../elfutils/elfutils-0.155/x86_64_dis.h | 1632 ++++++++++++++++++
meta/recipes-devtools/elfutils/elfutils_0.155.bb | 84 +
.../diffutils-3.2/obsolete_automake_macros.patch | 14 -
.../diffutils/diffutils-3.2/remove-gets.patch | 22 -
meta/recipes-extended/diffutils/diffutils.inc | 2 +-
.../{diffutils_3.2.bb => diffutils_3.3.bb} | 10 +-
meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch | 43 -
meta/recipes-extended/ed/{ed_1.7.bb => ed_1.8.bb} | 11 +-
.../files/debian/add-icmp-return-codes.diff | 43 -
.../iputils/files/debian/fix-arping-timeouts.diff | 26 -
.../files/debian/fix-dead-host-ping-stats.diff | 16 -
.../iputils/files/debian/targets.diff | 14 +-
.../iputils/files/debian/use_gethostbyname2.diff | 36 +-
.../{iputils_s20101006.bb => iputils_s20121221.bb} | 12 +-
.../xorg-lib/{libdmx_1.1.2.bb => libdmx_1.1.3.bb} | 4 +-
.../rxvt.desktop | 0
.../rxvt.png | Bin 2847 -> 2847 bytes
.../xwc.patch | 0
.../{rxvt-unicode_9.17.bb => rxvt-unicode_9.18.bb} | 6 +-
.../apr/{apr-util_1.5.1.bb => apr-util_1.5.2.bb} | 6 +-
.../apr/{apr_1.4.6.bb => apr_1.4.8.bb} | 6 +-
37 files changed, 11506 insertions(+), 228 deletions(-)
rename meta/recipes-bsp/usbutils/{usbutils_006.bb => usbutils_007.bb} (83%)
create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/arm_backend.diff
create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/do-autoreconf.diff
create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/dso-link-change.patch
create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/elf_additions.diff
create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/elfutils-ar-c-fix-num-passed-to-memset.patch
create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/elfutils-robustify.patch
create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/hppa_backend.diff
create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/i386_dis.h
create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/m68k_backend.diff
create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/mempcpy.patch
create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/mips_backend.diff
create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch
create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/redhat-portability.diff
create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/redhat-robustify.diff
create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/uclibc-support.patch
create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/x86_64_dis.h
create mode 100644 meta/recipes-devtools/elfutils/elfutils_0.155.bb
delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch
delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch
rename meta/recipes-extended/diffutils/{diffutils_3.2.bb => diffutils_3.3.bb} (59%)
delete mode 100644 meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch
rename meta/recipes-extended/ed/{ed_1.7.bb => ed_1.8.bb} (49%)
delete mode 100644 meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff
delete mode 100644 meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
delete mode 100644 meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff
rename meta/recipes-extended/iputils/{iputils_s20101006.bb => iputils_s20121221.bb} (82%)
rename meta/recipes-graphics/xorg-lib/{libdmx_1.1.2.bb => libdmx_1.1.3.bb} (79%)
rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.17 => rxvt-unicode-9.18}/rxvt.desktop (100%)
rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.17 => rxvt-unicode-9.18}/rxvt.png (100%)
rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.17 => rxvt-unicode-9.18}/xwc.patch (100%)
rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode_9.17.bb => rxvt-unicode_9.18.bb} (92%)
rename meta/recipes-support/apr/{apr-util_1.5.1.bb => apr-util_1.5.2.bb} (91%)
rename meta/recipes-support/apr/{apr_1.4.6.bb => apr_1.4.8.bb} (92%)Signature · 1 line
1.7.9.5
PATCH v4 1/9 iputils: Upgrade to v20121221
Removed obsolete patches
Header for arping changed. New author added.
---
.../files/debian/add-icmp-return-codes.diff | 43 --------------------
.../iputils/files/debian/fix-arping-timeouts.diff | 26 ------------
.../files/debian/fix-dead-host-ping-stats.diff | 16 --------
.../iputils/files/debian/targets.diff | 14 +++----
.../iputils/files/debian/use_gethostbyname2.diff | 36 ++++++++--------
.../{iputils_s20101006.bb => iputils_s20121221.bb} | 12 ++----
6 files changed, 29 insertions(+), 118 deletions(-)
delete mode 100644 meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff
delete mode 100644 meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
delete mode 100644 meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff
rename meta/recipes-extended/iputils/{iputils_s20101006.bb => iputils_s20121221.bb} (82%)meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff deleted +0 -43
@@ -1,43 +0,0 @@ -Upstream-Status: Pending [from other distro Debian] - -Index: trunk/ping.c -=================================================================== ---- trunk.orig/ping.c 2010-05-07 23:13:54.000000000 -0700 -+++ trunk/ping.c 2010-05-07 23:23:22.000000000 -0700 -@@ -883,9 +883,36 @@ - case ICMP_SR_FAILED: - printf("Source Route Failed\n"); - break; -+ case ICMP_NET_UNKNOWN: -+ printf("Destination Net Unknown\n"); -+ break; -+ case ICMP_HOST_UNKNOWN: -+ printf("Destination Host Unknown\n"); -+ break; -+ case ICMP_HOST_ISOLATED: -+ printf("Source Host Isolated\n"); -+ break; -+ case ICMP_NET_ANO: -+ printf("Destination Net Prohibited\n"); -+ break; -+ case ICMP_HOST_ANO: -+ printf("Destination Host Prohibited\n"); -+ break; -+ case ICMP_NET_UNR_TOS: -+ printf("Destination Net Unreachable for Type of Service\n"); -+ break; -+ case ICMP_HOST_UNR_TOS: -+ printf("Destination Host Unreachable for Type of Service\n"); -+ break; - case ICMP_PKT_FILTERED: - printf("Packet filtered\n"); - break; -+ case ICMP_PREC_VIOLATION: -+ printf("Precedence Violation\n"); -+ break; -+ case ICMP_PREC_CUTOFF: -+ printf("Precedence Cutoff\n"); -+ break; - default: - printf("Dest Unreachable, Bad Code: %d\n", code); - break;
meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff deleted +0 -26
@@ -1,26 +0,0 @@ -Upstream-Status: Pending [from other distro Debian] - -Index: trunk/arping.c -=================================================================== ---- trunk.orig/arping.c 2010-05-07 23:13:52.000000000 -0700 -+++ trunk/arping.c 2010-05-07 23:41:16.000000000 -0700 -@@ -182,12 +182,17 @@ - if (start.tv_sec==0) - start = tv; - -- if (count-- == 0 || (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500)) -+ if (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500) - finish(); - -- if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) { -+ if ((!timeout) && (count == 0)) -+ finish(); -+ -+ if ( count!=0 && (last.tv_sec==0 || MS_TDIFF(tv,last) > 500 ) ) { - send_pack(s, src, dst, - (struct sockaddr_ll *)&me, (struct sockaddr_ll *)&he); -+ if (count >= 0) -+ count--; - if (count == 0 && unsolicited) - finish(); - }
meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff deleted +0 -16
@@ -1,16 +0,0 @@ -Upstream-Status: Pending [from other distro Debian] - -Index: trunk/ping_common.c -=================================================================== ---- trunk.orig/ping_common.c 2010-05-07 23:13:51.000000000 -0700 -+++ trunk/ping_common.c 2010-05-07 23:22:33.000000000 -0700 -@@ -872,7 +872,8 @@ - printf("%spipe %d", comma, pipesize); - comma = ", "; - } -- if (ntransmitted > 1 && (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) { -+ if (ntransmitted > 1 && nreceived && -+ (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) { - int ipg = (1000000*(long long)tv.tv_sec+tv.tv_usec)/(ntransmitted-1); - printf("%sipg/ewma %d.%03d/%d.%03d ms", - comma, ipg/1000, ipg%1000, rtt/8000, (rtt/8)%1000);
meta/recipes-extended/iputils/files/debian/targets.diff +7 -7
@@ -1,15 +1,15 @@ Upstream-Status: Inappropriate [disable feature] -Index: trunk/Makefile +Index: iputils-s20121221/Makefile =================================================================== ---- trunk.orig/Makefile 2010-05-07 23:43:00.000000000 -0700 -+++ trunk/Makefile 2010-05-07 23:47:10.000000000 -0700 -@@ -16,7 +16,7 @@ - CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g - CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) +--- iputils-s20121221.orig/Makefile ++++ iputils-s20121221/Makefile +@@ -106,7 +106,7 @@ endif + endif + # ------------------------------------- -IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd -+IPV4_TARGETS=tracepath ping arping clockdiff ++IPV4_TARGETS=tracepath ping clockdiff arping IPV6_TARGETS=tracepath6 traceroute6 ping6 TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff +18 -18
@@ -1,31 +1,31 @@ Upstream-Status: Pending [from other distro Debian] -Index: trunk/tracepath.c +Index: iputils-s20121221/tracepath.c =================================================================== ---- trunk.orig/tracepath.c 2010-05-07 23:13:52.000000000 -0700 -+++ trunk/tracepath.c 2010-05-07 23:24:09.000000000 -0700 -@@ -338,9 +338,9 @@ - base_port = atoi(p+1); - } else - base_port = 44444; -- he = gethostbyname(argv[0]); +--- iputils-s20121221.orig/tracepath.c ++++ iputils-s20121221/tracepath.c +@@ -370,9 +370,9 @@ main(int argc, char **argv) + } + #endif + +- he = gethostbyname(p); + he = gethostbyname2(argv[0], AF_INET); if (he == NULL) { - herror("gethostbyname"); + herror("gethostbyname2"); exit(1); } - memcpy(&target.sin_addr, he->h_addr, 4); -Index: trunk/ping.c + +Index: iputils-s20121221/ping.c =================================================================== ---- trunk.orig/ping.c 2010-05-07 23:23:22.000000000 -0700 -+++ trunk/ping.c 2010-05-07 23:24:09.000000000 -0700 -@@ -250,7 +250,7 @@ - if (argc == 1) - options |= F_NUMERIC; - } else { -- hp = gethostbyname(target); -+ hp = gethostbyname2(target, AF_INET); +--- iputils-s20121221.orig/ping.c ++++ iputils-s20121221/ping.c +@@ -279,7 +279,7 @@ main(int argc, char **argv) + #else + idn = target; + #endif +- hp = gethostbyname(idn); ++ hp = gethostbyname2(idn, AF_INET); if (!hp) { fprintf(stderr, "ping: unknown host %s\n", target); exit(2);
meta/recipes-extended/iputils/iputils_s20121221.bb renamed from meta/recipes-extended/iputils/iputils_s20101006.bb +4 -8
@@ -8,25 +8,21 @@ LICENSE = "BSD & GPLv2+" LIC_FILES_CHKSUM = "file://ping.c;beginline=1;endline=35;md5=f9ceb201733e9a6cf8f00766dd278d82 \ file://tracepath.c;beginline=1;endline=10;md5=0ecea2bf60bff2f3d840096d87647f3d \ - file://arping.c;beginline=1;endline=10;md5=ada2a6d06acc90f943bddf40d15e0541 \ + file://arping.c;beginline=1;endline=11;md5=fe84301b5c2655c950f8b92a057fafa6 \ file://tftpd.c;beginline=1;endline=32;md5=28834bf8a91a5b8a92755dbee709ef96 " DEPENDS = "openssl docbook-utils-native sgmlspl-native" -PR = "r6" +PR = "r0" SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \ - file://debian/fix-dead-host-ping-stats.diff \ - file://debian/add-icmp-return-codes.diff \ file://debian/use_gethostbyname2.diff \ file://debian/targets.diff \ - file://debian/fix-arping-timeouts.diff \ file://nsgmls-path-fix.patch \ - file://arping-break-libsysfs-dependency.patch \ " -SRC_URI[md5sum] = "a36c25e9ec17e48be514dc0485e7376c" -SRC_URI[sha256sum] = "fd3af46c80ebb99607c2ca1f2a3608b6fe828e25bbec6e54f2afd25f6ddb6ee7" +SRC_URI[md5sum] = "6072aef64205720dd1893b375e184171" +SRC_URI[sha256sum] = "450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f" do_compile () { oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}:${STAGING_DIR_HOST}/${base_libdir}" all man
Signature · 1 line
1.7.9.5
PATCH v4 2/9 elfutils: Upgrade to v0.155
In reply to Radu Moisan*license changed to GPLv3
*several patches were absolete so I removed them *redhat-portability & redhat-robustify backported from
latest elfutils-portability & elfutils-robustify from upstream
--- .../elfutils/elfutils-0.155/arm_backend.diff | 450 +++++ .../elfutils/elfutils-0.155/do-autoreconf.diff | 215 +++ .../elfutils/elfutils-0.155/dso-link-change.patch | 32 + .../elfutils/elfutils-0.155/elf_additions.diff | 61 + .../elfutils-ar-c-fix-num-passed-to-memset.patch | 23 + .../elfutils-0.155/elfutils-robustify.patch | 1756 +++++++++++++++++++ .../elfutils/elfutils-0.155/hppa_backend.diff | 796 +++++++++ .../elfutils/elfutils-0.155/i386_dis.h | 1657 ++++++++++++++++++ .../elfutils/elfutils-0.155/m68k_backend.diff | 303 ++++ .../elfutils/elfutils-0.155/mempcpy.patch | 24 + .../elfutils/elfutils-0.155/mips_backend.diff | 708 ++++++++ ...ssed-to-snprintf-for-invalid-sh_name-case.patch | 27 + .../elfutils-0.155/redhat-portability.diff | 1775 +++++++++++++++++++ .../elfutils/elfutils-0.155/redhat-robustify.diff | 1824 ++++++++++++++++++++ .../elfutils/elfutils-0.155/uclibc-support.patch | 91 + .../elfutils/elfutils-0.155/x86_64_dis.h | 1632 ++++++++++++++++++ meta/recipes-devtools/elfutils/elfutils_0.155.bb | 84 + 17 files changed, 11458 insertions(+) create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/arm_backend.diff create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/do-autoreconf.diff create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/dso-link-change.patch create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/elf_additions.diff create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/elfutils-ar-c-fix-num-passed-to-memset.patch create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/elfutils-robustify.patch create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/hppa_backend.diff create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/i386_dis.h create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/m68k_backend.diff create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/mempcpy.patch create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/mips_backend.diff create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/redhat-portability.diff create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/redhat-robustify.diff create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/uclibc-support.patch create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.155/x86_64_dis.h create mode 100644 meta/recipes-devtools/elfutils/elfutils_0.155.bb
meta/recipes-devtools/elfutils/elfutils-0.155/arm_backend.diff new file +450 -0
@@ -0,0 +1,450 @@ +Upstream-Status: Backport + +Index: elfutils-0.155/backends/arm_init.c +=================================================================== +--- elfutils-0.155.orig/backends/arm_init.c ++++ elfutils-0.155/backends/arm_init.c +@@ -35,21 +35,32 @@ + #define RELOC_PREFIX R_ARM_ + #include "libebl_CPU.h" + ++#include "libebl_arm.h" ++ + /* This defines the common reloc hooks based on arm_reloc.def. */ + #include "common-reloc.c" + + + const char * + arm_init (elf, machine, eh, ehlen) +- Elf *elf __attribute__ ((unused)); ++ Elf *elf; + GElf_Half machine __attribute__ ((unused)); + Ebl *eh; + size_t ehlen; + { ++ int soft_float = 0; ++ + /* Check whether the Elf_BH object has a sufficent size. */ + if (ehlen < sizeof (Ebl)) + return NULL; + ++ if (elf) { ++ GElf_Ehdr ehdr_mem; ++ GElf_Ehdr *ehdr = gelf_getehdr (elf, &ehdr_mem); ++ if (ehdr && (ehdr->e_flags & EF_ARM_SOFT_FLOAT)) ++ soft_float = 1; ++ } ++ + /* We handle it. */ + eh->name = "ARM"; + arm_init_reloc (eh); +@@ -61,7 +72,10 @@ arm_init (elf, machine, eh, ehlen) + HOOK (eh, core_note); + HOOK (eh, auxv_info); + HOOK (eh, check_object_attribute); +- HOOK (eh, return_value_location); ++ if (soft_float) ++ eh->return_value_location = arm_return_value_location_soft; ++ else ++ eh->return_value_location = arm_return_value_location_hard; + + return MODVERSION; + } +Index: elfutils-0.155/backends/arm_regs.c +=================================================================== +--- elfutils-0.155.orig/backends/arm_regs.c ++++ elfutils-0.155/backends/arm_regs.c +@@ -31,6 +31,7 @@ + #endif + + #include <string.h> ++#include <stdio.h> + #include <dwarf.h> + + #define BACKEND arm_ +@@ -61,7 +62,15 @@ arm_register_info (Ebl *ebl __attribute_ + namelen = 2; + break; + +- case 10 ... 12: ++ case 10 ... 11: ++ name[0] = 'r'; ++ name[1] = '1'; ++ name[2] = regno % 10 + '0'; ++ namelen = 3; ++ break; ++ ++ case 12: ++ *type = DW_ATE_unsigned; + name[0] = 'r'; + name[1] = '1'; + name[2] = regno % 10 + '0'; +@@ -76,6 +85,9 @@ arm_register_info (Ebl *ebl __attribute_ + break; + + case 16 + 0 ... 16 + 7: ++ /* AADWARF says that there are no registers in that range, ++ * but gcc maps FPA registers here ++ */ + regno += 96 - 16; + /* Fall through. */ + case 96 + 0 ... 96 + 7: +@@ -87,11 +99,139 @@ arm_register_info (Ebl *ebl __attribute_ + namelen = 2; + break; + ++ case 64 + 0 ... 64 + 9: ++ *setname = "VFP"; ++ *bits = 32; ++ *type = DW_ATE_float; ++ name[0] = 's'; ++ name[1] = regno - 64 + '0'; ++ namelen = 2; ++ break; ++ ++ case 64 + 10 ... 64 + 31: ++ *setname = "VFP"; ++ *bits = 32; ++ *type = DW_ATE_float; ++ name[0] = 's'; ++ name[1] = (regno - 64) / 10 + '0'; ++ name[2] = (regno - 64) % 10 + '0'; ++ namelen = 3; ++ break; ++ ++ case 104 + 0 ... 104 + 7: ++ /* XXX TODO: ++ * This can be either intel wireless MMX general purpose/control ++ * registers or xscale accumulator, which have different usage. ++ * We only have the intel wireless MMX here now. ++ * The name needs to be changed for the xscale accumulator too. */ ++ *setname = "MMX"; ++ *type = DW_ATE_unsigned; ++ *bits = 32; ++ memcpy(name, "wcgr", 4); ++ name[4] = regno - 104 + '0'; ++ namelen = 5; ++ break; ++ ++ case 112 + 0 ... 112 + 9: ++ *setname = "MMX"; ++ *type = DW_ATE_unsigned; ++ *bits = 64; ++ name[0] = 'w'; ++ name[1] = 'r'; ++ name[2] = regno - 112 + '0'; ++ namelen = 3; ++ break; ++ ++ case 112 + 10 ... 112 + 15: ++ *setname = "MMX"; ++ *type = DW_ATE_unsigned; ++ *bits = 64; ++ name[0] = 'w'; ++ name[1] = 'r'; ++ name[2] = '1'; ++ name[3] = regno - 112 - 10 + '0'; ++ namelen = 4; ++ break; ++ + case 128: ++ *setname = "special"; + *type = DW_ATE_unsigned; + return stpcpy (name, "spsr") + 1 - name; + ++ case 129: ++ *setname = "special"; ++ *type = DW_ATE_unsigned; ++ return stpcpy(name, "spsr_fiq") + 1 - name; ++ ++ case 130: ++ *setname = "special"; ++ *type = DW_ATE_unsigned; ++ return stpcpy(name, "spsr_irq") + 1 - name; ++ ++ case 131: ++ *setname = "special"; ++ *type = DW_ATE_unsigned; ++ return stpcpy(name, "spsr_abt") + 1 - name; ++ ++ case 132: ++ *setname = "special"; ++ *type = DW_ATE_unsigned; ++ return stpcpy(name, "spsr_und") + 1 - name; ++ ++ case 133: ++ *setname = "special"; ++ *type = DW_ATE_unsigned; ++ return stpcpy(name, "spsr_svc") + 1 - name; ++ ++ case 144 ... 150: ++ *setname = "integer"; ++ *type = DW_ATE_signed; ++ *bits = 32; ++ return sprintf(name, "r%d_usr", regno - 144 + 8) + 1; ++ ++ case 151 ... 157: ++ *setname = "integer"; ++ *type = DW_ATE_signed; ++ *bits = 32; ++ return sprintf(name, "r%d_fiq", regno - 151 + 8) + 1; ++ ++ case 158 ... 159: ++ *setname = "integer"; ++ *type = DW_ATE_signed; ++ *bits = 32; ++ return sprintf(name, "r%d_irq", regno - 158 + 13) + 1; ++ ++ case 160 ... 161: ++ *setname = "integer"; ++ *type = DW_ATE_signed; ++ *bits = 32; ++ return sprintf(name, "r%d_abt", regno - 160 + 13) + 1; ++ ++ case 162 ... 163: ++ *setname = "integer"; ++ *type = DW_ATE_signed; ++ *bits = 32; ++ return sprintf(name, "r%d_und", regno - 162 + 13) + 1; ++ ++ case 164 ... 165: ++ *setname = "integer"; ++ *type = DW_ATE_signed; ++ *bits = 32; ++ return sprintf(name, "r%d_svc", regno - 164 + 13) + 1; ++ ++ case 192 ... 199: ++ *setname = "MMX"; ++ *bits = 32; ++ *type = DW_ATE_unsigned; ++ name[0] = 'w'; ++ name[1] = 'c'; ++ name[2] = regno - 192 + '0'; ++ namelen = 3; ++ break; ++ + case 256 + 0 ... 256 + 9: ++ /* XXX TODO: Neon also uses those registers and can contain ++ * both float and integers */ + *setname = "VFP"; + *type = DW_ATE_float; + *bits = 64; +Index: elfutils-0.155/backends/arm_retval.c +=================================================================== +--- elfutils-0.155.orig/backends/arm_retval.c ++++ elfutils-0.155/backends/arm_retval.c +@@ -48,6 +48,13 @@ static const Dwarf_Op loc_intreg[] = + #define nloc_intreg 1 + #define nloc_intregs(n) (2 * (n)) + ++/* f1 */ /* XXX TODO: f0 can also have number 96 if program was compiled with -mabi=aapcs */ ++static const Dwarf_Op loc_fpreg[] = ++ { ++ { .atom = DW_OP_reg16 }, ++ }; ++#define nloc_fpreg 1 ++ + /* The return value is a structure and is actually stored in stack space + passed in a hidden argument by the caller. But, the compiler + helpfully returns the address of that space in r0. */ +@@ -58,8 +65,9 @@ static const Dwarf_Op loc_aggregate[] = + #define nloc_aggregate 1 + + +-int +-arm_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp) ++static int ++arm_return_value_location_ (Dwarf_Die *functypedie, const Dwarf_Op **locp, ++ int soft_float) + { + /* Start with the function's type, and get the DW_AT_type attribute, + which is the type of the return value. */ +@@ -112,14 +120,31 @@ arm_return_value_location (Dwarf_Die *fu + else + return -1; + } ++ if (tag == DW_TAG_base_type) ++ { ++ Dwarf_Word encoding; ++ if (dwarf_formudata (dwarf_attr_integrate (typedie, DW_AT_encoding, ++ &attr_mem), &encoding) != 0) ++ return -1; ++ ++ if ((encoding == DW_ATE_float) && !soft_float) ++ { ++ *locp = loc_fpreg; ++ if (size <= 8) ++ return nloc_fpreg; ++ goto aggregate; ++ } ++ } + if (size <= 16) + { + intreg: + *locp = loc_intreg; + return size <= 4 ? nloc_intreg : nloc_intregs ((size + 3) / 4); + } ++ /* fall through. */ + + aggregate: ++ /* XXX TODO sometimes aggregates are returned in r0 (-mabi=aapcs) */ + *locp = loc_aggregate; + return nloc_aggregate; + +@@ -138,3 +163,18 @@ arm_return_value_location (Dwarf_Die *fu + DWARF and might be valid. */ + return -2; + } ++ ++/* return location for -mabi=apcs-gnu -msoft-float */ ++int ++arm_return_value_location_soft (Dwarf_Die *functypedie, const Dwarf_Op **locp) ++{ ++ return arm_return_value_location_ (functypedie, locp, 1); ++} ++ ++/* return location for -mabi=apcs-gnu -mhard-float (current default) */ ++int ++arm_return_value_location_hard (Dwarf_Die *functypedie, const Dwarf_Op **locp) ++{ ++ return arm_return_value_location_ (functypedie, locp, 0); ++} ++ +Index: elfutils-0.155/libelf/elf.h +=================================================================== +--- elfutils-0.155.orig/libelf/elf.h ++++ elfutils-0.155/libelf/elf.h +@@ -2281,6 +2281,9 @@ typedef Elf32_Addr Elf32_Conflict; + #define EF_ARM_EABI_VER4 0x04000000 + #define EF_ARM_EABI_VER5 0x05000000 + ++/* EI_OSABI values */ ++#define ELFOSABI_ARM_AEABI 64 /* Contains symbol versioning. */ ++ + /* Additional symbol types for Thumb. */ + #define STT_ARM_TFUNC STT_LOPROC /* A Thumb function. */ + #define STT_ARM_16BIT STT_HIPROC /* A Thumb label. */ +@@ -2298,12 +2301,19 @@ typedef Elf32_Addr Elf32_Conflict; + + /* Processor specific values for the Phdr p_type field. */ + #define PT_ARM_EXIDX (PT_LOPROC + 1) /* ARM unwind segment. */ ++#define PT_ARM_UNWIND PT_ARM_EXIDX + + /* Processor specific values for the Shdr sh_type field. */ + #define SHT_ARM_EXIDX (SHT_LOPROC + 1) /* ARM unwind section. */ + #define SHT_ARM_PREEMPTMAP (SHT_LOPROC + 2) /* Preemption details. */ + #define SHT_ARM_ATTRIBUTES (SHT_LOPROC + 3) /* ARM attributes section. */ + ++/* Processor specific values for the Dyn d_tag field. */ ++#define DT_ARM_RESERVED1 (DT_LOPROC + 0) ++#define DT_ARM_SYMTABSZ (DT_LOPROC + 1) ++#define DT_ARM_PREEMTMAB (DT_LOPROC + 2) ++#define DT_ARM_RESERVED2 (DT_LOPROC + 3) ++#define DT_ARM_NUM 4 + + /* ARM relocs. */ + +@@ -2336,12 +2346,75 @@ typedef Elf32_Addr Elf32_Conflict; + #define R_ARM_GOTPC 25 /* 32 bit PC relative offset to GOT */ + #define R_ARM_GOT32 26 /* 32 bit GOT entry */ + #define R_ARM_PLT32 27 /* 32 bit PLT address */ ++#define R_ARM_CALL 28 ++#define R_ARM_JUMP24 29 ++#define R_ARM_THM_JUMP24 30 ++#define R_ARM_BASE_ABS 31 + #define R_ARM_ALU_PCREL_7_0 32 + #define R_ARM_ALU_PCREL_15_8 33 + #define R_ARM_ALU_PCREL_23_15 34 + #define R_ARM_LDR_SBREL_11_0 35 + #define R_ARM_ALU_SBREL_19_12 36 + #define R_ARM_ALU_SBREL_27_20 37 ++#define R_ARM_TARGET1 38 ++#define R_ARM_SBREL31 39 ++#define R_ARM_V4BX 40 ++#define R_ARM_TARGET2 41 ++#define R_ARM_PREL31 42 ++#define R_ARM_MOVW_ABS_NC 43 ++#define R_ARM_MOVT_ABS 44 ++#define R_ARM_MOVW_PREL_NC 45 ++#define R_ARM_MOVT_PREL 46 ++#define R_ARM_THM_MOVW_ABS_NC 47 ++#define R_ARM_THM_MOVT_ABS 48 ++#define R_ARM_THM_MOVW_PREL_NC 49 ++#define R_ARM_THM_MOVT_PREL 50 ++#define R_ARM_THM_JUMP19 51 ++#define R_ARM_THM_JUMP6 52 ++#define R_ARM_THM_ALU_PREL_11_0 53 ++#define R_ARM_THM_PC12 54 ++#define R_ARM_ABS32_NO 55 ++#define R_ARM_REL32_NO 56 ++#define R_ARM_ALU_PC_G0_NC 57 ++#define R_ARM_ALU_PC_G0 58 ++#define R_ARM_ALU_PC_G1_NC 59 ++#define R_ARM_ALU_PC_G1 60 ++#define R_ARM_ALU_PC_G2 61 ++#define R_ARM_LDR_PC_G1 62 ++#define R_ARM_LDR_PC_G2 63 ++#define R_ARM_LDRS_PC_G0 64 ++#define R_ARM_LDRS_PC_G1 65 ++#define R_ARM_LDRS_PC_G2 66 ++#define R_ARM_LDC_PC_G0 67 ++#define R_ARM_LDC_PC_G1 68 ++#define R_ARM_LDC_PC_G2 69 ++#define R_ARM_ALU_SB_G0_NC 70 ++#define R_ARM_ALU_SB_G0 71 ++#define R_ARM_ALU_SB_G1_NC 72 ++#define R_ARM_ALU_SB_G1 73 ++#define R_ARM_ALU_SB_G2 74 ++#define R_ARM_LDR_SB_G0 75 ++#define R_ARM_LDR_SB_G1 76 ++#define R_ARM_LDR_SB_G2 77 ++#define R_ARM_LDRS_SB_G0 78 ++#define R_ARM_LDRS_SB_G1 79 ++#define R_ARM_LDRS_SB_G2 80 ++#define R_ARM_LDC_G0 81 ++#define R_ARM_LDC_G1 82 ++#define R_ARM_LDC_G2 83 ++#define R_ARM_MOVW_BREL_NC 84 ++#define R_ARM_MOVT_BREL 85 ++#define R_ARM_MOVW_BREL 86 ++#define R_ARM_THM_MOVW_BREL_NC 87 ++#define R_ARM_THM_MOVT_BREL 88 ++#define R_ARM_THM_MOVW_BREL 89 ++/* 90-93 unallocated */ ++#define R_ARM_PLT32_ABS 94 ++#define R_ARM_GOT_ABS 95 ++#define R_ARM_GOT_PREL 96 ++#define R_ARM_GOT_BREL12 97 ++#define R_ARM_GOTOFF12 98 ++#define R_ARM_GOTRELAX 99 + #define R_ARM_TLS_GOTDESC 90 + #define R_ARM_TLS_CALL 91 + #define R_ARM_TLS_DESCSEQ 92 +@@ -2360,6 +2433,13 @@ typedef Elf32_Addr Elf32_Conflict; + static TLS block offset */ + #define R_ARM_TLS_LE32 108 /* 32 bit offset relative to static + TLS block */ ++#define R_ARM_TLS_LDO12 109 ++#define R_ARM_TLS_LE12 110 ++#define R_ARM_TLS_IE12GP 111 ++/* 112 - 127 private range */ ++#define R_ARM_ME_TOO 128|/* obsolete */ ++ ++ + #define R_ARM_THM_TLS_DESCSEQ 129 + #define R_ARM_IRELATIVE 160 + #define R_ARM_RXPC25 249 +Index: elfutils-0.155/backends/libebl_arm.h +=================================================================== +--- /dev/null ++++ elfutils-0.155/backends/libebl_arm.h +@@ -0,0 +1,9 @@ ++#ifndef _LIBEBL_ARM_H ++#define _LIBEBL_ARM_H 1 ++ ++#include <libdw.h> ++ ++extern int arm_return_value_location_soft(Dwarf_Die *, const Dwarf_Op **locp); ++extern int arm_return_value_location_hard(Dwarf_Die *, const Dwarf_Op **locp); ++ ++#endif
meta/recipes-devtools/elfutils/elfutils-0.155/do-autoreconf.diff new file +215 -0
215 lines not on this page · raw message
meta/recipes-devtools/elfutils/elfutils-0.155/dso-link-change.patch new file +32 -0
@@ -0,0 +1,32 @@ +Upstream-Status: Pending + +# This patch makes the link to the dependencies of libdw explicit, as recent +# ld no longer implicitly links them. See +# http://lists.fedoraproject.org/pipermail/devel/2010-March/133601.html as +# a similar example of the error message you can encounter without this patch, +# and https://fedoraproject.org/wiki/UnderstandingDSOLinkChange and +# https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking for more +# details. + +--- elfutils-0.155.orig/src/Makefile.am ++++ elfutils-0.155/src/Makefile.am +@@ -86,7 +86,7 @@ libdw = ../libdw/libdw.a $(zip_LIBS) $(l + libelf = ../libelf/libelf.a + else + libasm = ../libasm/libasm.so +-libdw = ../libdw/libdw.so ++libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl + libelf = ../libelf/libelf.so + endif + libebl = ../libebl/libebl.a +--- elfutils-0.155.orig/tests/Makefile.am ++++ elfutils-0.155/tests/Makefile.am +@@ -172,7 +172,7 @@ libdw = ../libdw/libdw.a $(zip_LIBS) $(l + libelf = ../libelf/libelf.a + libasm = ../libasm/libasm.a + else +-libdw = ../libdw/libdw.so ++libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl + libelf = ../libelf/libelf.so + libasm = ../libasm/libasm.so + endif
meta/recipes-devtools/elfutils/elfutils-0.155/elf_additions.diff new file +61 -0
61 lines not on this page · raw message
meta/recipes-devtools/elfutils/elfutils-0.155/elfutils-ar-c-fix-num-passed-to-memset.patch new file +23 -0
@@ -0,0 +1,23 @@ +Upstream-Status: Backport + +ar.c (do_oper_delete): Fix num passed to memset +native build failed as following on Fedora18+: +ar.c: In function 'do_oper_delete': +ar.c:918:31: error: argument to 'sizeof' in 'memset' call is the same expression as the destination; did you mean to dereference it? [-Werror=sizeof-pointer-memaccess] + memset (found, '\0', sizeof (found)); + ^ +The original commit is http://git.fedorahosted.org/cgit/elfutils.git/commit/src/ar.c?id=1a4d0668d18bf1090c5c08cdb5cb3ba2b8eb5410 + +Signed-off-by: Zhenhua Luo <[email protected]> + +--- elfutils-0.155/src/ar.c.org 2013-03-12 21:12:17.928281375 -0500 ++++ elfutils-0.155/src/ar.c 2013-03-12 21:15:30.053285271 -0500 +@@ -915,7 +915,7 @@ + long int instance) + { + bool *found = alloca (sizeof (bool) * argc); +- memset (found, '\0', sizeof (found)); ++ memset (found, '\0', sizeof (bool) * argc); + + /* List of the files we keep. */ + struct armem *to_copy = NULL;
meta/recipes-devtools/elfutils/elfutils-0.155/elfutils-robustify.patch new file +1756 -0
1,756 lines not on this page · raw message
meta/recipes-devtools/elfutils/elfutils-0.155/hppa_backend.diff new file +796 -0
463 lines not on this page · raw message
meta/recipes-devtools/elfutils/elfutils-0.155/i386_dis.h new file +1657 -0
1,657 lines not on this page · raw message
meta/recipes-devtools/elfutils/elfutils-0.155/m68k_backend.diff new file +303 -0
303 lines not on this page · raw message
meta/recipes-devtools/elfutils/elfutils-0.155/mempcpy.patch new file +24 -0
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/elfutils/elfutils-0.155/mips_backend.diff new file +708 -0
708 lines not on this page · raw message
meta/recipes-devtools/elfutils/elfutils-0.155/nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch new file +27 -0
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/elfutils/elfutils-0.155/redhat-portability.diff new file +1775 -0
1,775 lines not on this page · raw message
meta/recipes-devtools/elfutils/elfutils-0.155/redhat-robustify.diff new file +1824 -0
1,824 lines not on this page · raw message
meta/recipes-devtools/elfutils/elfutils-0.155/uclibc-support.patch new file +91 -0
91 lines not on this page · raw message
meta/recipes-devtools/elfutils/elfutils-0.155/x86_64_dis.h new file +1632 -0
1,632 lines not on this page · raw message
meta/recipes-devtools/elfutils/elfutils_0.155.bb new file +84 -0
84 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.9.5
Part of the diff is not shown here. View the raw message.
PATCH v4 3/9 rxvt-unicode: Upgrade to v9.18
In reply to Radu Moisando_configure was initially failing because could not stat aclocal.m4, prepended ${S} so that it could find the file, however I don't know the reasoning for do_configure_prepend in this recipe, it also builds fine without it
---
.../rxvt.desktop | 0
.../rxvt.png | Bin 2847 -> 2847 bytes
.../xwc.patch | 0
.../{rxvt-unicode_9.17.bb => rxvt-unicode_9.18.bb} | 6 +++---
4 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.17 => rxvt-unicode-9.18}/rxvt.desktop (100%)
rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.17 => rxvt-unicode-9.18}/rxvt.png (100%)
rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.17 => rxvt-unicode-9.18}/xwc.patch (100%)
rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode_9.17.bb => rxvt-unicode_9.18.bb} (92%)meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.desktop renamed from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/rxvt.desktop +0 -0
meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.png renamed from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/rxvt.png +0 -0
meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/xwc.patch renamed from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/xwc.patch +0 -0
meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.18.bb renamed from meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.17.bb +3 -3
@@ -17,8 +17,8 @@ SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 file://rxvt.desktop \ file://rxvt.png" -SRC_URI[md5sum] = "1270432bdc7ce17dbb07d41a607081e0" -SRC_URI[sha256sum] = "de017b2b2a1a7182aeada99f605da33cbee18d450e07a7fdabef48da446521e4" +SRC_URI[md5sum] = "963ccc748fe5bca925e7b92c0404d68b" +SRC_URI[sha256sum] = "87b72a43cac7c9362a984094c661a632ce1a829ad90f149142ab1953854b433f" inherit autotools update-alternatives
@@ -42,7 +42,7 @@ EXTRA_OECONF = "--enable-menubar --enable-xim \ --with-x=${STAGING_DIR_HOST}${prefix}" do_configure_prepend () { - cp aclocal.m4 acinclude.m4 + cp ${S}/aclocal.m4 ${S}/acinclude.m4 } do_compile_prepend () {
Signature · 1 line
1.7.9.5
PATCH v4 4/9 ed: Upgrade to v1.8
In reply to Radu MoisanLicense files chenged but not the license type
---
meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch | 43 --------------------
meta/recipes-extended/ed/{ed_1.7.bb => ed_1.8.bb} | 11 +++--
2 files changed, 5 insertions(+), 49 deletions(-)
delete mode 100644 meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch
rename meta/recipes-extended/ed/{ed_1.7.bb => ed_1.8.bb} (49%)meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch deleted +0 -43
@@ -1,43 +0,0 @@ -http://lists.gnu.org/archive/html/bug-ed/2008-12/msg00001.html - -2007-04-16 Mike Frysinger <[email protected]> - - * Do not set CC/CXX/CPPFLAGS/LDFLAGS to "" so that user can - override if they so choose. - * Only set CFLAGS/CXXFLAGS if user did not specify any. - -ed had already taken GPLv3 when this patch out, so it should be GPLv3. -Signed-off-by: Zhai Edwin <[email protected]> - -Upstream-Status: Pending - -Index: ed-1.5/configure -=================================================================== ---- ed-1.5.orig/configure 2010-08-30 07:34:49.000000000 -0700 -+++ ed-1.5/configure 2010-11-20 16:42:20.490645823 -0800 -@@ -26,10 +26,6 @@ - mandir='$(datadir)/man' - sysconfdir='$(prefix)/etc' - program_prefix= --CC= --CPPFLAGS= --CFLAGS='-Wall -W -O2' --LDFLAGS= - - # Loop over all args - while [ -n "$1" ] ; do -@@ -105,6 +101,14 @@ - esac - done - -+# Defaults if the user did not select any -+if [ x"${CFLAGS+set}" != xset ] ; then -+ CFLAGS='-Wall -W -O2' -+fi -+if [ x"${CXXFLAGS+set}" != xset ] ; then -+ CXXFLAGS='-Wall -W -O2' -+fi -+ - # Find the source files, if location was not specified. - srcdirtext= - if [ -z "${srcdir}" ] ; then
meta/recipes-extended/ed/ed_1.8.bb renamed from meta/recipes-extended/ed/ed_1.7.bb +5 -6
@@ -4,8 +4,8 @@ BUGTRACKER = "" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ - file://ed.h;endline=20;md5=c708cda1b2e8d723d458690b7db03878 \ - file://main.c;endline=24;md5=1bd039d59e04ee5f82adcc970144a2c3" + file://ed.h;endline=20;md5=375a20cc2545ac1115eeb7b323c60ae3 \ + file://main.c;endline=24;md5=1b31246da5e3864d7b30094ff76bf7ed" SECTION = "base" PR = "r0"
@@ -13,11 +13,10 @@ PR = "r0" # LSB states that ed should be in /bin/ bindir = "${base_bindir}" -SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz \ - file://ed-1.2-build.patch" +SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz" -SRC_URI[md5sum] = "0aa4e2428e325203d0d7c3e86c961b1c" -SRC_URI[sha256sum] = "894241019a5ff2b7816d20c5bd5a7048fb8f336ca52e97b3cc88d45b16472031" +SRC_URI[md5sum] = "2268d2344b3c52d23730acb2e3c942fe" +SRC_URI[sha256sum] = "64c138d33b1ea4b9daa88e045da0619e2a43cb99a9d378417d20163f410a7273" do_configure() { ${S}/configure
Signature · 1 line
1.7.9.5
PATCH v4 5/9 libdmx: Upgrade to v1.1.3
In reply to Radu Moisan---
.../xorg-lib/{libdmx_1.1.2.bb => libdmx_1.1.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libdmx_1.1.2.bb => libdmx_1.1.3.bb} (79%)meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb renamed from meta/recipes-graphics/xorg-lib/libdmx_1.1.2.bb +2 -2
@@ -16,6 +16,6 @@ DEPENDS += "libxext dmxproto" PR = "r0" PE = "1" -SRC_URI[md5sum] = "782ced3a9e754dfeb53a8a006a75eb1a" -SRC_URI[sha256sum] = "a7870b648a8768d65432af76dd11581ff69f3955118540d5967eb1eef43838ba" +SRC_URI[md5sum] = "ba983eba5a9f05d152a0725b8e863151" +SRC_URI[sha256sum] = "c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201"
Signature · 1 line
1.7.9.5
PATCH v4 6/9 apr: Upgrade to v1.4.8
In reply to Radu Moisan---
.../apr/{apr_1.4.6.bb => apr_1.4.8.bb} | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
rename meta/recipes-support/apr/{apr_1.4.6.bb => apr_1.4.8.bb} (92%)meta/recipes-support/apr/apr_1.4.8.bb renamed from meta/recipes-support/apr/apr_1.4.6.bb +2 -4
@@ -9,15 +9,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \ BBCLASSEXTEND = "native" -PR = "r2" - SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://configure_fixes.patch \ file://cleanup.patch \ file://configfix.patch" -SRC_URI[md5sum] = "ffee70a111fd07372982b0550bbb14b7" -SRC_URI[sha256sum] = "9b635e60feb163e6fc6c375721f71f44d7e26d6b9cd52f6b86b04e65d2481cbc" +SRC_URI[md5sum] = "ce2ab01a0c3cdb71cf0a6326b8654f41" +SRC_URI[sha256sum] = "61b8d2f8d321c6365ee3d71d0bb41f3a89c44da6124cc5b407a3b8319d660421" inherit autotools lib_package binconfig multilib_header
Signature · 1 line
1.7.9.5
PATCH v4 7/9 apr-util: Upgrade to v1.5.2
In reply to Radu Moisan---
.../apr/{apr-util_1.5.1.bb => apr-util_1.5.2.bb} | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
rename meta/recipes-support/apr/{apr-util_1.5.1.bb => apr-util_1.5.2.bb} (91%)meta/recipes-support/apr/apr-util_1.5.2.bb renamed from meta/recipes-support/apr/apr-util_1.5.1.bb +2 -4
@@ -9,14 +9,12 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \ file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42" -PR = "r0" - SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ file://configfix.patch \ file://configure_fixes.patch" -SRC_URI[md5sum] = "490c2e26e2dc95fd0983ad71112ddac6" -SRC_URI[sha256sum] = "0cf4e48d93ceb9a5e314f48fe127211b71d30234665587e2eaffbb4fc13d931d" +SRC_URI[md5sum] = "eb682cfb8642babba427a4fb391b15e8" +SRC_URI[sha256sum] = "a1ec5025373815795d2fa5bfac40c0984675feffc88e049be9a162c408c2f613" EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \
Signature · 1 line
1.7.9.5
PATCH v4 8/9 diffutils: Upgrade to v3.3
In reply to Radu Moisan---
.../diffutils-3.2/obsolete_automake_macros.patch | 14 -------------
.../diffutils/diffutils-3.2/remove-gets.patch | 22 --------------------
meta/recipes-extended/diffutils/diffutils.inc | 2 +-
.../{diffutils_3.2.bb => diffutils_3.3.bb} | 10 ++-------
4 files changed, 3 insertions(+), 45 deletions(-)
delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch
delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch
rename meta/recipes-extended/diffutils/{diffutils_3.2.bb => diffutils_3.3.bb} (59%)meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch deleted +0 -14
@@ -1,14 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Marko Lindqvist <[email protected]> -diff -Nurd diffutils-3.2/configure.ac diffutils-3.2/configure.ac ---- diffutils-3.2/configure.ac 2011-08-11 18:17:54.000000000 +0300 -+++ diffutils-3.2/configure.ac 2013-02-08 08:13:28.271427213 +0200 -@@ -33,7 +33,6 @@ - - AC_PROG_AWK - AC_PROG_CC --AM_PROG_CC_STDC - AM_MISSING_PROG([HELP2MAN], [help2man]) - AC_PROG_RANLIB - gl_EARLY
meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch deleted +0 -22
@@ -1,22 +0,0 @@ -check for gets before using it - -Signed-off-by: Khem Raj <[email protected]> -Upstream-Status: Pending -Index: diffutils-3.2/lib/stdio.in.h -=================================================================== ---- diffutils-3.2.orig/lib/stdio.in.h 2011-08-28 04:57:28.000000000 -0700 -+++ diffutils-3.2/lib/stdio.in.h 2012-07-03 10:45:07.518322117 -0700 -@@ -693,11 +693,13 @@ - _GL_CXXALIAS_SYS (gets, char *, (char *s)); - # undef gets - # endif -+# if defined gets - _GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+# endif - #endif - -
meta/recipes-extended/diffutils/diffutils.inc +1 -1
@@ -6,7 +6,7 @@ SECTION = "base" INC_PR = "r7" -SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz" inherit autotools update-alternatives gettext
meta/recipes-extended/diffutils/diffutils_3.3.bb renamed from meta/recipes-extended/diffutils/diffutils_3.2.bb +2 -8
@@ -10,11 +10,5 @@ do_configure_prepend () { done } -PR = "${INC_PR}.1" - -SRC_URI += "file://remove-gets.patch \ - file://obsolete_automake_macros.patch \ -" - -SRC_URI[md5sum] = "22e4deef5d8949a727b159d6bc65c1cc" -SRC_URI[sha256sum] = "2aaaebef615be7dc365306a14caa5d273a4fc174f9f10abca8b60e082c054ed3" +SRC_URI[md5sum] = "99180208ec2a82ce71f55b0d7389f1b3" +SRC_URI[sha256sum] = "a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c"
Signature · 1 line
1.7.9.5
PATCH v4 9/9 usbutils: Upgrade to v007
In reply to Radu Moisan---
.../usbutils/{usbutils_006.bb => usbutils_007.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-bsp/usbutils/{usbutils_006.bb => usbutils_007.bb} (83%)meta/recipes-bsp/usbutils/usbutils_007.bb renamed from meta/recipes-bsp/usbutils/usbutils_006.bb +2 -3
@@ -7,14 +7,13 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libusb zlib" -PR = "r0" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ file://usb-devices-avoid-dependency-on-bash.patch \ file://Fix-NULL-pointer-crash.patch" -SRC_URI[md5sum] = "850790442f5eb487cdc7e35f8ee03e11" -SRC_URI[sha256sum] = "553270b4030f0844cb70aed57e61c7f10a7ed6641c3bed20249201cec9bcf122" +SRC_URI[md5sum] = "be6c42294be5c940f208190d3479d50c" +SRC_URI[sha256sum] = "e65c234cadf7c81b6b1567c440e3b9b31b44f51c27df3e45741b88848d8b37d3" inherit autotools
Signature · 1 line
1.7.9.5
Re: [PATCH 8/9] diffutils: Upgrade to v3.3
In reply to Radu MoisanQuoted 64 lines · Radu Moisan
Signed-off-by Radu Moisan <[email protected]>--- .../diffutils-3.2/obsolete_automake_macros.patch | 14 ------------- .../diffutils/diffutils-3.2/remove-gets.patch | 22 -------------------- meta/recipes-extended/diffutils/diffutils.inc | 2 +- .../{diffutils_3.2.bb => diffutils_3.3.bb} | 10 ++------- 4 files changed, 3 insertions(+), 45 deletions(-)delete mode 100644
meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patchdelete mode 100644meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patchrename meta/recipes-extended/diffutils/{diffutils_3.2.bb => diffutils_3.3.bb} (59%)meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch deleted +0
-14@@ -1,14 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Marko Lindqvist <[email protected]> -diff -Nurd diffutils-3.2/configure.ac diffutils-3.2/configure.ac ---- diffutils-3.2/configure.ac 2011-08-11 18:17:54.000000000 +0300 -+++ diffutils-3.2/configure.ac 2013-02-08 08:13:28.271427213 +0200 -@@ -33,7 +33,6 @@ - - AC_PROG_AWK - AC_PROG_CC --AM_PROG_CC_STDC - AM_MISSING_PROG([HELP2MAN], [help2man]) - AC_PROG_RANLIB - gl_EARLYmeta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch deleted +0
-22@@ -1,22 +0,0 @@ -check for gets before using it - -Signed-off-by: Khem Raj <[email protected]> -Upstream-Status: Pending -Index: diffutils-3.2/lib/stdio.in.h -=================================================================== ---- diffutils-3.2.orig/lib/stdio.in.h 2011-08-28 04:57:28.000000000 -0700 -+++ diffutils-3.2/lib/stdio.in.h 2012-07-03 10:45:07.518322117 -0700 -@@ -693,11 +693,13 @@ - _GL_CXXALIAS_SYS (gets, char *, (char *s)); - # undef gets - # endif -+# if defined gets - _GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+# endif - #endif - -meta/recipes-extended/diffutils/diffutils.inc +0
-0
meta/recipes-extended/diffutils/diffutils.inc SECTION = "base" · line 8
Quoted 3 lines
meta/recipes-extended/diffutils/diffutils.inc +0
-0@@ -6,7 +6,7 @@ SECTION = "base" INC_PR = "r7"
I guess we need to keep this since it's used by the gplv2 version still, but you could move it there and have the recipe file maintain a PR of r7.0? ??
meta/recipes-extended/diffutils/diffutils.inc SECTION = "base" · line 10
Quoted 3 lines
meta/recipes-extended/diffutils/diffutils.inc +1
-1-SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz"
This change causes problems for the gplv2 version, so SRC_URI should move to the versioned bb files.
Sau!
Quoted 24 lines
meta/recipes-extended/diffutils/diffutils.inc +0
-0inherit autotools update-alternatives gettextmeta/recipes-extended/diffutils/diffutils_3.3.bb renamed from meta/recipes-extended/diffutils/diffutils_3.2.bb +2
-8@@ -10,11 +10,5 @@ do_configure_prepend () { done } -PR = "${INC_PR}.1" - -SRC_URI += "file://remove-gets.patch \ - file://obsolete_automake_macros.patch \ -" - -SRC_URI[md5sum] = "22e4deef5d8949a727b159d6bc65c1cc" -SRC_URI[sha256sum] = "2aaaebef615be7dc365306a14caa5d273a4fc174f9f10abca8b60e082c054ed3" +SRC_URI[md5sum] = "99180208ec2a82ce71f55b0d7389f1b3" +SRC_URI[sha256sum] = "a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c"
Re: [PATCH 1/9] iputils: Upgrade to v20121221
In reply to Radu MoisanQuoted 12 lines · Radu Moisan
Removed obsolete patches
Header for arping changed. New author added.Signed-off-by Radu Moisan <[email protected]>--- .../files/debian/add-icmp-return-codes.diff | 43 -------------------- .../iputils/files/debian/fix-arping-timeouts.diff | 26 ------------ .../files/debian/fix-dead-host-ping-stats.diff | 16 -------- .../iputils/files/debian/targets.diff | 14 +++---- .../iputils/files/debian/use_gethostbyname2.diff | 36 ++++++++-------- .../{iputils_s20101006.bb => iputils_s20121221.bb} | 12 ++---- 6 files changed, 29 insertions(+), 118 deletions(-)
Quoted 5 lines
delete mode 100644
meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diffdelete mode 100644meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diffdelete mode 100644meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diffrename meta/recipes-extended/iputils/{iputils_s20101006.bb => iputils_s20121221.bb} (82%)
This seems to fail for lib64 multilib build:
Quoted 51 lines
Log data follows:
| DEBUG: Executing shell function do_compile | NOTE: make -j 16 -e MAKEFLAGS= CC=x86_64-pokymllib64-linux-gcc -m64 --sysroot=/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-multilib/build/build/tmp/sysroots/lib64-qemux86 -D_GNU_SOURCE VPATH=/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-multilib/build/build/tmp/sysroots/lib64-qemux86/usr/lib64:/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-multilib/build/build/tmp/sysroots/lib64-qemux86//lib64 all man | fatal: No names found, cannot describe anything. | x86_64-pokymllib64-linux-gcc -m64 --sysroot=/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-multilib/build/build/tmp/sysroots/lib64-qemux86 -D_GNU_SOURCE -O2 -pipe -g -feliminate-unused-debug-types -c tracepath.c -o tracepath.o | x86_64-pokymllib64-linux-gcc -m64 --sysroot=/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-multilib/build/build/tmp/sysroots/lib64-qemux86 -D_GNU_SOURCE -O2 -pipe -g -feliminate-unused-debug-types -c ping.c -DCAPABILITIES -o ping.o | x86_64-pokymllib64-linux-gcc -m64 --sysroot=/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-multilib/build/build/tmp/sysroots/lib64-qemux86 -D_GNU_SOURCE -O2 -pipe -g -feliminate-unused-debug-types -c ping_common.c -DCAPABILITIES -o ping_common.o | x86_64-pokymllib64-linux-gcc -m64 --sysroot=/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-multilib/build/build/tmp/sysroots/lib64-qemux86 -D_GNU_SOURCE -O2 -pipe -g -feliminate-unused-debug-types -c clockdiff.c -DCAPABILITIES -o clockdiff.o | x86_64-pokymllib64-linux-gcc -m64 --sysroot=/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-multilib/build/build/tmp/sysroots/lib64-qemux86 -D_GNU_SOURCE -O2 -pipe -g -feliminate-unused-debug-types -c arping.c -DCAPABILITIES -o arping.o | x86_64-pokymllib64-linux-gcc -m64 --sysroot=/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-multilib/build/build/tmp/sysroots/lib64-qemux86 -D_GNU_SOURCE -O2 -pipe -g -feliminate-unused-debug-types -c tracepath6.c -o tracepath6.o | x86_64-pokymllib64-linux-gcc -m64 --sysroot=/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-multilib/build/build/tmp/sysroots/lib64-qemux86 -D_GNU_SOURCE -O2 -pipe -g -feliminate-unused-debug-types -c traceroute6.c -DCAPABILITIES -o traceroute6.o | x86_64-pokymllib64-linux-gcc -m64 --sysroot=/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-multilib/build/build/tmp/sysroots/lib64-qemux86 -D_GNU_SOURCE -O2 -pipe -g -feliminate-unused-debug-types -c ping6.c -DCAPABILITIES -o ping6.o | make -C doc man | make[1]: Entering directory `/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-multilib/build/build/tmp/work/x86_64-pokymllib64-linux/lib64-iputils/s20121221-r0/iputils-s20121221/doc' | traceroute6.c:253:28: fatal error: sys/capability.h: No such file or directory | #include <sys/capability.h> | ^ | compilation terminated. | make: *** [traceroute6.o] Error 1 | make: *** Waiting for unfinished jobs.... | arping.c:28:28: fatal error: sys/capability.h: No such file or directory | #include <sys/capability.h> | ^ | compilation terminated. | make: *** [arping.o] Error 1 | In file included from ping6.c:69:0: | ping_common.h:23:28: fatal error: sys/capability.h: No such file or directory | #include <sys/capability.h> | ^ | compilation terminated. | make: *** [ping6.o] Error 1 | In file included from ping.c:61:0: | ping_common.h:23:28: fatal error: sys/capability.h: No such file or directory | #include <sys/capability.h> | ^ | compilation terminated. | clockdiff.c:24:28: fatal error: sys/capability.h: No such file or directory | #include <sys/capability.h> | ^ | compilation terminated. | make: *** [ping.o] Error 1 | make: *** [clockdiff.o] Error 1 | In file included from ping_common.c:1:0: | ping_common.h:23:28: fatal error: sys/capability.h: No such file or directory | #include <sys/capability.h> | ^ | compilation terminated. | make: *** [ping_common.o] Error 1 | make[1]: Leaving directory `/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-multilib/build/build/tmp/work/x86_64-pokymllib64-linux/lib64-iputils/s20121221-r0/iputils-s20121221/doc' | ERROR: oe_runmake failed | ERROR: Function failed: do_compile (log file is located at /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-multilib/build/build/tmp/work/x86_64-pokymllib64-linux/lib64-iputils/s20121221-r0/temp/log.do_compile.13794)
Quoted 1 line
NOTE: recipe lib64-iputils-s20121221-r0: task
do_compile: Failed
Sau!
Quoted 222 lines
meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff deleted +0
-43@@ -1,43 +0,0 @@ -Upstream-Status: Pending [from other distro Debian] - -Index: trunk/ping.c -=================================================================== ---- trunk.orig/ping.c 2010-05-07 23:13:54.000000000 -0700 -+++ trunk/ping.c 2010-05-07 23:23:22.000000000 -0700 -@@ -883,9 +883,36 @@ - case ICMP_SR_FAILED: - printf("Source Route Failed\n"); - break; -+ case ICMP_NET_UNKNOWN: -+ printf("Destination Net Unknown\n"); -+ break; -+ case ICMP_HOST_UNKNOWN: -+ printf("Destination Host Unknown\n"); -+ break; -+ case ICMP_HOST_ISOLATED: -+ printf("Source Host Isolated\n"); -+ break; -+ case ICMP_NET_ANO: -+ printf("Destination Net Prohibited\n"); -+ break; -+ case ICMP_HOST_ANO: -+ printf("Destination Host Prohibited\n"); -+ break; -+ case ICMP_NET_UNR_TOS: -+ printf("Destination Net Unreachable for Type of Service\n"); -+ break; -+ case ICMP_HOST_UNR_TOS: -+ printf("Destination Host Unreachable for Type of Service\n"); -+ break; - case ICMP_PKT_FILTERED: - printf("Packet filtered\n"); - break; -+ case ICMP_PREC_VIOLATION: -+ printf("Precedence Violation\n"); -+ break; -+ case ICMP_PREC_CUTOFF: -+ printf("Precedence Cutoff\n"); -+ break; - default: - printf("Dest Unreachable, Bad Code: %d\n", code); - break;meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff deleted +0
-26@@ -1,26 +0,0 @@ -Upstream-Status: Pending [from other distro Debian] - -Index: trunk/arping.c -=================================================================== ---- trunk.orig/arping.c 2010-05-07 23:13:52.000000000 -0700 -+++ trunk/arping.c 2010-05-07 23:41:16.000000000 -0700 -@@ -182,12 +182,17 @@ - if (start.tv_sec==0) - start = tv; - -- if (count-- == 0 || (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500)) -+ if (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500) - finish(); - -- if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) { -+ if ((!timeout) && (count == 0)) -+ finish(); -+ -+ if ( count!=0 && (last.tv_sec==0 || MS_TDIFF(tv,last) > 500 ) ) { - send_pack(s, src, dst, - (struct sockaddr_ll *)&me, (struct sockaddr_ll *)&he); -+ if (count >= 0) -+ count--; - if (count == 0 && unsolicited) - finish(); - }meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff deleted +0
-16@@ -1,16 +0,0 @@ -Upstream-Status: Pending [from other distro Debian] - -Index: trunk/ping_common.c -=================================================================== ---- trunk.orig/ping_common.c 2010-05-07 23:13:51.000000000 -0700 -+++ trunk/ping_common.c 2010-05-07 23:22:33.000000000 -0700 -@@ -872,7 +872,8 @@ - printf("%spipe %d", comma, pipesize); - comma = ", "; - } -- if (ntransmitted > 1 && (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) { -+ if (ntransmitted > 1 && nreceived && -+ (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) { - int ipg = (1000000*(long long)tv.tv_sec+tv.tv_usec)/(ntransmitted-1); - printf("%sipg/ewma %d.%03d/%d.%03d ms", - comma, ipg/1000, ipg%1000, rtt/8000, (rtt/8)%1000);meta/recipes-extended/iputils/files/debian/targets.diff +7
-7@@ -1,15 +1,15 @@ Upstream-Status: Inappropriate [disable feature] -Index: trunk/Makefile +Index: iputils-s20121221/Makefile =================================================================== ---- trunk.orig/Makefile 2010-05-07 23:43:00.000000000 -0700 -+++ trunk/Makefile 2010-05-07 23:47:10.000000000 -0700 -@@ -16,7 +16,7 @@ - CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g - CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) +--- iputils-s20121221.orig/Makefile ++++ iputils-s20121221/Makefile +@@ -106,7 +106,7 @@ endif + endif + # ------------------------------------- -IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd -+IPV4_TARGETS=tracepath ping arping clockdiff ++IPV4_TARGETS=tracepath ping clockdiff arping IPV6_TARGETS=tracepath6 traceroute6 ping6 TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff +18
-18@@ -1,31 +1,31 @@ Upstream-Status: Pending [from other distro Debian] -Index: trunk/tracepath.c +Index: iputils-s20121221/tracepath.c =================================================================== ---- trunk.orig/tracepath.c 2010-05-07 23:13:52.000000000 -0700 -+++ trunk/tracepath.c 2010-05-07 23:24:09.000000000 -0700 -@@ -338,9 +338,9 @@ - base_port = atoi(p+1); - } else - base_port = 44444; -- he = gethostbyname(argv[0]); +--- iputils-s20121221.orig/tracepath.c ++++ iputils-s20121221/tracepath.c +@@ -370,9 +370,9 @@ main(int argc, char **argv) + } + #endif + +- he = gethostbyname(p); + he = gethostbyname2(argv[0], AF_INET); if (he == NULL) { - herror("gethostbyname"); + herror("gethostbyname2"); exit(1); } - memcpy(&target.sin_addr, he->h_addr, 4); -Index: trunk/ping.c + +Index: iputils-s20121221/ping.c =================================================================== ---- trunk.orig/ping.c 2010-05-07 23:23:22.000000000 -0700 -+++ trunk/ping.c 2010-05-07 23:24:09.000000000 -0700 -@@ -250,7 +250,7 @@ - if (argc == 1) - options |= F_NUMERIC; - } else { -- hp = gethostbyname(target); -+ hp = gethostbyname2(target, AF_INET); +--- iputils-s20121221.orig/ping.c ++++ iputils-s20121221/ping.c +@@ -279,7 +279,7 @@ main(int argc, char **argv) + #else + idn = target; + #endif +- hp = gethostbyname(idn); ++ hp = gethostbyname2(idn, AF_INET); if (!hp) { fprintf(stderr, "ping: unknown host %s\n", target); exit(2);meta/recipes-extended/iputils/iputils_s20121221.bb renamed from meta/recipes-extended/iputils/iputils_s20101006.bb +4
-8@@ -8,25 +8,21 @@ LICENSE = "BSD & GPLv2+" LIC_FILES_CHKSUM = "file://ping.c;beginline=1;endline=35;md5=f9ceb201733e9a6cf8f00766dd278d82 \ file://tracepath.c;beginline=1;endline=10;md5=0ecea2bf60bff2f3d840096d87647f3d \ - file://arping.c;beginline=1;endline=10;md5=ada2a6d06acc90f943bddf40d15e0541 \ + file://arping.c;beginline=1;endline=11;md5=fe84301b5c2655c950f8b92a057fafa6 \ file://tftpd.c;beginline=1;endline=32;md5=28834bf8a91a5b8a92755dbee709ef96 " DEPENDS = "openssl docbook-utils-native sgmlspl-native" -PR = "r6" +PR = "r0" SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \ - file://debian/fix-dead-host-ping-stats.diff \ - file://debian/add-icmp-return-codes.diff \ file://debian/use_gethostbyname2.diff \ file://debian/targets.diff \ - file://debian/fix-arping-timeouts.diff \ file://nsgmls-path-fix.patch \ - file://arping-break-libsysfs-dependency.patch \ " -SRC_URI[md5sum] = "a36c25e9ec17e48be514dc0485e7376c" -SRC_URI[sha256sum] = "fd3af46c80ebb99607c2ca1f2a3608b6fe828e25bbec6e54f2afd25f6ddb6ee7" +SRC_URI[md5sum] = "6072aef64205720dd1893b375e184171" +SRC_URI[sha256sum] = "450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f" do_compile () { oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}:${STAGING_DIR_HOST}/${base_libdir}" all man
Re: [PATCH 1/9] iputils: Upgrade to v20121221
Quoted 25 lines · Saul Wold
Quoted 14 lines · Radu Moisan
Removed obsolete patches
Header for arping changed. New author added.Signed-off-by Radu Moisan <[email protected]>--- .../files/debian/add-icmp-return-codes.diff | 43 -------------------- .../iputils/files/debian/fix-arping-timeouts.diff | 26 ------------ .../files/debian/fix-dead-host-ping-stats.diff | 16 -------- .../iputils/files/debian/targets.diff | 14 +++---- .../iputils/files/debian/use_gethostbyname2.diff | 36 ++++++++-------- .../{iputils_s20101006.bb => iputils_s20121221.bb} | 12 ++---- 6 files changed, 29 insertions(+), 118 deletions(-)Quoted 9 lines
delete mode 100644
meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff
delete mode 100644meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
delete mode 100644meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff
rename meta/recipes-extended/iputils/{iputils_s20101006.bb =>
iputils_s20121221.bb} (82%)
Quoted 1 line
This seems to fail for lib64 multilib build:
Ok, found the problem, with this version they've enabled capability support (with libcap) by default, so libcap must be added in DEPENDS, unless we want to patch it not to use capability support by default. (??) Speaking of things enabled by default, they also enabled GNUTLS, that's why initially I submitted the patch with GNUTLS. Do we want to use default (upstream) configuration with gnutls?
Radu