added my Recipes
This commit is contained in:
@@ -0,0 +1,69 @@
|
||||
From 549773fdaf1fb003b84f25df386a07d299cdeb3e Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 18 Jul 2017 21:25:33 -0700
|
||||
Subject: [PATCH] zeroconf: Rename arp_op to avoid namespace conflicts with C
|
||||
library
|
||||
|
||||
on musl e.g. we get
|
||||
In file included from /mnt/a/oe/build/tmp/work/corei7-64-bec-linux-musl/zeroconf/0.9-r1/recipe-sysroot/usr/include/net/ethernet.h:10:0,
|
||||
|
||||
This is because in musl arp_op is a define which is included
|
||||
and causes the conflict
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
zeroconf.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/zeroconf.c b/zeroconf.c
|
||||
index 812d34b..f27e907 100644
|
||||
--- a/zeroconf.c
|
||||
+++ b/zeroconf.c
|
||||
@@ -14,8 +14,6 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
-#include <linux/rtnetlink.h>
|
||||
-#include <linux/if.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -34,6 +32,8 @@
|
||||
#include <sys/time.h>
|
||||
#include <signal.h>
|
||||
#include <limits.h>
|
||||
+#include <linux/rtnetlink.h>
|
||||
+#include <linux/if.h>
|
||||
|
||||
#include "delay.h"
|
||||
|
||||
@@ -108,7 +108,7 @@ int arp_conflict(struct intf *intf, struct arp_packet *pkt);
|
||||
void arp_packet_dump(struct arp_packet *pkt);
|
||||
void arp_packet_send(int as,
|
||||
struct intf *intf,
|
||||
- short int arp_op,
|
||||
+ short int arpop,
|
||||
int null_sender);
|
||||
void arp_probe(int as, struct intf *intf);
|
||||
void arp_claim(int as, struct intf *intf);
|
||||
@@ -1591,7 +1591,7 @@ int arp_conflict(struct intf *intf, struct arp_packet *pkt)
|
||||
|
||||
void arp_packet_send(int as,
|
||||
struct intf *intf,
|
||||
- short int arp_op,
|
||||
+ short int arpop,
|
||||
int null_sender)
|
||||
{
|
||||
|
||||
@@ -1605,7 +1605,7 @@ void arp_packet_send(int as,
|
||||
ap.arp.ar_pro = htons(ARP_IP_PROTO);
|
||||
ap.arp.ar_hln = ETH_ALEN;
|
||||
ap.arp.ar_pln = 4; /* octets in IPv4 address */
|
||||
- ap.arp.ar_op = htons(arp_op);
|
||||
+ ap.arp.ar_op = htons(arpop);
|
||||
|
||||
/* filling with 0xff sets the destination to
|
||||
* the broadcast link-layer address for free
|
||||
--
|
||||
2.13.3
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
| zeroconf.c: In function 'main':
|
||||
| zeroconf.c:145: error: 'PATH_MAX' undeclared (first use in this function)
|
||||
|
||||
RP - 4/9/09
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Index: zeroconf-0.9/zeroconf.c
|
||||
===================================================================
|
||||
--- zeroconf-0.9.orig/zeroconf.c 2009-09-04 10:05:25.000000000 +0100
|
||||
+++ zeroconf-0.9/zeroconf.c 2009-09-04 10:05:42.000000000 +0100
|
||||
@@ -33,6 +33,7 @@
|
||||
#include <net/if_arp.h>
|
||||
#include <sys/time.h>
|
||||
#include <signal.h>
|
||||
+#include <limits.h>
|
||||
|
||||
#include "delay.h"
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ ! -x /usr/sbin/zeroconf ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# IPv4 link-local addresses (zeroconf) are
|
||||
# only applicable on the 'inet' address family
|
||||
[ "X$ADDRFAM" != "Xinet" ] && exit 0
|
||||
|
||||
# However there are some methods where it doesn't
|
||||
# make any sense to configure an IPv4LL address
|
||||
|
||||
# not on loopback
|
||||
[ "X$METHOD" = "Xloopback" ] && exit 0
|
||||
|
||||
# not on ppp or wvdial either
|
||||
[ "X$METHOD" = "Xppp" ] && exit 0
|
||||
[ "X$METHOD" = "Xwvdial" ] && exit 0
|
||||
|
||||
# The administrator may have blacklisted interfaces
|
||||
# or only want zeroconf in a fallback situation
|
||||
[ -f /etc/default/zeroconf ] &&
|
||||
. /etc/default/zeroconf
|
||||
|
||||
[ -n "$DISABLE" ] && exit 0
|
||||
|
||||
for BLACK in $IFBLACKLIST; do
|
||||
case $IFACE in
|
||||
$BLACK)
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# should we only allocate an address if we do not already have one?
|
||||
if [ -n "$FALLBACK" ]; then
|
||||
/sbin/ip addr show $IFACE scope global | grep -q "inet"
|
||||
IP=$?
|
||||
if [ $IP -eq 0 ]; then
|
||||
/sbin/ip route add 169.254.0.0/16 dev $IFACE
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
# otherwise, run if we aren't already going
|
||||
if [ ! -r /var/run/zeroconf.$IFACE.pid ]; then
|
||||
/usr/sbin/zeroconf -i $IFACE
|
||||
fi
|
||||
|
||||
exit 0
|
||||
@@ -0,0 +1,19 @@
|
||||
Add LDFLAGS variable to Makefile, make sure the extra linker flags can be passed.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 77f3364..c98083f 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -18,7 +18,7 @@ clean:
|
||||
|
||||
zeroconf: zeroconf.o delay.o
|
||||
$(Q)echo "Creating $@"
|
||||
- $(Q)$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
|
||||
+ $(Q)$(CC) $(CFLAGS) ${LDFLAGS} -o $@ $^ $(LIBS)
|
||||
|
||||
|
||||
# Automatic dependency generation
|
||||
@@ -0,0 +1,17 @@
|
||||
# Default for zeroconf
|
||||
|
||||
# disable zeroconf
|
||||
# If you want to disable zeroconf completely, uncomment the following line
|
||||
# this may be useful if you are debugging zeroconf or starting it manually
|
||||
#DISABLE=yes
|
||||
|
||||
# black-listed interfaces
|
||||
# Interfaces which you never wish to have zeroconf run on should
|
||||
# be listed here. e.g. "eth2 wlan1" in a space seperated string
|
||||
IFBLACKLIST=""
|
||||
|
||||
# fallback only
|
||||
# If you would only like a link-local address if you were unable to
|
||||
# obtain an address via DHCP then uncomment the following line
|
||||
#FALLBACK=yes
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
SUMMARY = "IPv4 link-local address allocator"
|
||||
DESCRIPTION = "Zeroconf is a program that is used to claim IPv4 \
|
||||
link-local addresses. IPv4 link-local addresses are useful when setting \
|
||||
up ad-hoc networking between devices without the involvement of a either \
|
||||
a DHCP server or network administrator. \
|
||||
These addresses are allocated from the 169.254.0.0/16 address range and \
|
||||
are normally attached to each Ethernet device in your computer. \
|
||||
Addresses are assigned randomly by each host and, in case of collision, \
|
||||
both hosts (are supposed to) renumber."
|
||||
AUTHOR = "Anand Kumria <wildfire@progsoc.uts.edu.au>"
|
||||
HOMEPAGE = "http://www.progsoc.org/~wildfire/zeroconf/"
|
||||
LICENSE = "GPL-2.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4 \
|
||||
file://zeroconf.c;beginline=1;endline=13;md5=a5bada96e1e34b08eb7446b28e2630b2"
|
||||
SECTION = "net"
|
||||
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${BPN}-${PV}.tar.gz \
|
||||
file://compilefix.patch \
|
||||
file://makefile-add-ldflags.patch \
|
||||
file://zeroconf-default \
|
||||
file://debian-zeroconf \
|
||||
file://0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "bdafb16b008ebb5633e4e581f77821d2"
|
||||
SRC_URI[sha256sum] = "a8c74df127753e2310fa1e072f3c9ca44a404bb0bbce9cfec7a84c6dff8bec7b"
|
||||
|
||||
do_install () {
|
||||
install -d ${D}${sbindir}
|
||||
install -d ${D}${sysconfdir}/network/if-up.d
|
||||
install -d ${D}${sysconfdir}/default
|
||||
install -c -m 755 ${S}/zeroconf ${D}${sbindir}/zeroconf
|
||||
install -c -m 755 ${WORKDIR}/debian-zeroconf ${D}${sysconfdir}/network/if-up.d/zeroconf
|
||||
install -c ${WORKDIR}/zeroconf-default ${D}${sysconfdir}/default/zeroconf
|
||||
}
|
||||
Reference in New Issue
Block a user