diff options
author | Koen Kooi <koen@openembedded.org> | 2005-06-30 08:19:37 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-06-30 08:19:37 +0000 |
commit | c8e5702127e507e82e6f68a4b8c546803accea9d (patch) | |
tree | 00583491f40ecc640f2b28452af995e3a63a09d7 /packages/udhcp | |
parent | 87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff) |
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/udhcp')
-rw-r--r-- | packages/udhcp/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/udhcp/files/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/udhcp/files/gcc3.patch | 15 | ||||
-rw-r--r-- | packages/udhcp/files/install.patch | 64 | ||||
-rw-r--r-- | packages/udhcp/files/nostrip.patch | 30 | ||||
-rw-r--r-- | packages/udhcp/udhcp_0.9.8.bb | 30 |
6 files changed, 139 insertions, 0 deletions
diff --git a/packages/udhcp/.mtn2git_empty b/packages/udhcp/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udhcp/.mtn2git_empty diff --git a/packages/udhcp/files/.mtn2git_empty b/packages/udhcp/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udhcp/files/.mtn2git_empty diff --git a/packages/udhcp/files/gcc3.patch b/packages/udhcp/files/gcc3.patch index e69de29bb2..a39f42a7bd 100644 --- a/packages/udhcp/files/gcc3.patch +++ b/packages/udhcp/files/gcc3.patch @@ -0,0 +1,15 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- udhcp-0.9.8/dhcpc.c~gcc3 ++++ udhcp-0.9.8/dhcpc.c +@@ -132,6 +132,7 @@ + state = INIT_SELECTING; + break; + case INIT_SELECTING: ++ ; + } + + /* start things over */ diff --git a/packages/udhcp/files/install.patch b/packages/udhcp/files/install.patch index e69de29bb2..7cec1c087f 100644 --- a/packages/udhcp/files/install.patch +++ b/packages/udhcp/files/install.patch @@ -0,0 +1,64 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- udhcp-0.9.8/Makefile~install.patch ++++ udhcp-0.9.8/Makefile +@@ -1,10 +1,11 @@ + # udhcp makefile + ++DESTDIR= + prefix=/usr +-SBINDIR=/sbin +-USRSBINDIR=${prefix}/sbin +-USRBINDIR=${prefix}/bin +-USRSHAREDIR=${prefix}/share ++sbindir=/sbin ++usrsbindir=$(prefix)/sbin ++usrbindir=$(prefix)/bin ++datadir=$(prefix)/share + + # Uncomment this to get a shared binary. Call as udhcpd for the server, + # and udhcpc for the client +@@ -81,25 +82,27 @@ + + + install: all +- +- $(INSTALL) $(DAEMONS) $(USRSBINDIR) +- $(INSTALL) $(COMMANDS) $(USRBINDIR) ++ $(INSTALL) -d $(DESTDIR)$(usrsbindir) ++ $(INSTALL) $(DAEMONS) $(DESTDIR)$(usrsbindir) ++ $(INSTALL) -d $(DESTDIR)$(usrbindir) ++ $(INSTALL) $(COMMANDS) $(DESTDIR)$(usrbindir) ++ $(INSTALL) -d $(DESTDIR)$(sbindir) + ifdef COMBINED_BINARY +- ln -sf $(USRSBINDIR)/$(DAEMONS) $(SBINDIR)/$(BOOT_PROGRAMS) ++ ln -sf $(usrsbindir)/$(DAEMONS) $(DESTDIR)$(sbindir)/$(BOOT_PROGRAMS) + else +- $(INSTALL) $(BOOT_PROGRAMS) $(SBINDIR) ++ $(INSTALL) $(BOOT_PROGRAMS) $(DESTDIR)$(sbindir) + endif +- mkdir -p $(USRSHAREDIR)/udhcpc ++ $(INSTALL) -d $(DESTDIR)$(datadir)/udhcpc + for name in bound deconfig renew script ; do \ + $(INSTALL) samples/sample.$$name \ +- $(USRSHAREDIR)/udhcpc/default.$$name ; \ ++ $(DESTDIR)$(datadir)/udhcpc/default.$$name ; \ + done +- mkdir -p $(USRSHAREDIR)/man/man1 +- $(INSTALL) dumpleases.1 $(USRSHAREDIR)/man/man1 +- mkdir -p $(USRSHAREDIR)/man/man5 +- $(INSTALL) udhcpd.conf.5 $(USRSHAREDIR)/man/man5 +- mkdir -p $(USRSHAREDIR)/man/man8 +- $(INSTALL) udhcpc.8 udhcpd.8 $(USRSHAREDIR)/man/man8 ++ $(INSTALL) -d $(DESTDIR)$(mandir)/man1 ++ $(INSTALL) dumpleases.1 $(DESTDIR)$(mandir)/man1 ++ $(INSTALL) -d $(DESTDIR)$(mandir)/man5 ++ $(INSTALL) udhcpd.conf.5 $(DESTDIR)$(mandir)/man5 ++ $(INSTALL) -d $(DESTDIR)$(mandir)/man8 ++ $(INSTALL) udhcpc.8 udhcpd.8 $(DESTDIR)$(mandir)/man8 + + clean: + -rm -f udhcpd udhcpc dumpleases *.o core diff --git a/packages/udhcp/files/nostrip.patch b/packages/udhcp/files/nostrip.patch index e69de29bb2..7c8af095cc 100644 --- a/packages/udhcp/files/nostrip.patch +++ b/packages/udhcp/files/nostrip.patch @@ -0,0 +1,30 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- udhcp-0.9.8/Makefile~nostrip ++++ udhcp-0.9.8/Makefile +@@ -24,7 +24,6 @@ + + VER := 0.9.8 + +- + OBJS_SHARED = options.o socket.o packet.o pidfile.o + DHCPD_OBJS = dhcpd.o arpping.o files.o leases.o serverpacket.o + DHCPC_OBJS = dhcpc.o clientpacket.o script.o +@@ -56,14 +55,11 @@ + + ifdef DEBUG + CFLAGS += -g -DDEBUG +-STRIP=true + else + CFLAGS += -Os -fomit-frame-pointer +-STRIP=$(CROSS_COMPILE)strip + endif + + all: $(EXEC1) $(EXEC2) $(EXEC3) +- $(STRIP) --remove-section=.note --remove-section=.comment $(EXEC1) $(EXEC2) $(EXEC3) + + $(OBJS1) $(OBJS2) $(OBJS3): *.h Makefile + $(EXEC1) $(EXEC2) $(EXEC3): Makefile diff --git a/packages/udhcp/udhcp_0.9.8.bb b/packages/udhcp/udhcp_0.9.8.bb index e69de29bb2..98f257a603 100644 --- a/packages/udhcp/udhcp_0.9.8.bb +++ b/packages/udhcp/udhcp_0.9.8.bb @@ -0,0 +1,30 @@ +SECTION = "console/network" +DESCRIPTION = "Small dhcp client and dhcp server. Designed for embedded use." +HOMEPAGE = "http://udhcp.busybox.net/" +MAINTAINER = "Chris Larson <kergoth@handhelds.org>" +LICENSE = "GPL" + +SRC_URI = "http://udhcp.busybox.net/source/udhcp-${PV}.tar.gz \ + file://install.patch;patch=1 \ + file://nostrip.patch;patch=1 \ + file://gcc3.patch;patch=1" + +inherit autotools + +CFLAGS =+ "-UDEFAULT_SCRIPT -DDEFAULT_SCRIPT=\"${datadir}/udhcpc/default.script\" \ + -DVERSION=\"${PV}\"" +EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CCLD}' \ + 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' \ + 'prefix=${prefix}' 'sbindir=/sbin' \ + 'usrsbindir=${sbindir}' \ + 'usrbindir=${bindir}' \ + 'datadir=${datadir}'" + +PACKAGES = "udhcpc udhcpc-doc udhcpd udhcpd-doc" +FILES_udhcpc = "/sbin/udhcpc ${datadir}/udhcpc" +FILES_udhcpc-doc = "${mandir}/man8/udhcpc.8" +FILES_udhcpd = "${sbindir}/udhcpd \ + ${bindir}/dumpleases" +FILES_udhcpd-doc = "${mandir}/man1/dumpleases.1 \ + ${mandir}/man8/udhcpd.8 \ + ${mandir}/man5/udhcpd.conf.5" |