Skip to contentSkip to conversation

portmap: convert to gentargets and bump to 6.0.0

PATCH New Martin Banky 3 participants 21 messages Oct 8, 2010 – Dec 11, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/9 portmap: convert to gentargets and bump to 6.0.0

portmap has a new maintainer, Neil Brown, who has made some updates to portmap. Also, changed the download location to Debian to get the latest patches.

---
 package/portmap/Config.in                          |    2 +-
 package/portmap/portmap-01-5beta.patch             |   80 -----
 package/portmap/portmap-02-4.0-malloc.patch        |  338 --------------------
 package/portmap/portmap-4.0-cleanup.patch          |   85 -----
 package/portmap/portmap-4.0-rpc_user.patch         |   59 ----
 package/portmap/portmap-4.0-sigpipe.patch          |   12 -
 package/portmap/portmap-5b-include-errno_h.patch   |   18 -
 package/portmap/portmap-5b-optional-tcpd.patch     |   38 ---
 package/portmap/portmap-6.0.0-no-tcp-wrapper.patch |   36 ++
 package/portmap/portmap.mk                         |   86 +++---
 10 files changed, 82 insertions(+), 672 deletions(-)
 delete mode 100644 package/portmap/portmap-01-5beta.patch
 delete mode 100644 package/portmap/portmap-02-4.0-malloc.patch
 delete mode 100644 package/portmap/portmap-4.0-cleanup.patch
 delete mode 100644 package/portmap/portmap-4.0-rpc_user.patch
 delete mode 100644 package/portmap/portmap-4.0-sigpipe.patch
 delete mode 100644 package/portmap/portmap-5b-include-errno_h.patch
 delete mode 100644 package/portmap/portmap-5b-optional-tcpd.patch
 create mode 100644 package/portmap/portmap-6.0.0-no-tcp-wrapper.patch
package/portmap/Config.in +1 -1
index 41b38e9..1f22ab6 100644
@@ -4,7 +4,7 @@ config BR2_PACKAGE_PORTMAP
 	help
 	  The standard portmapper for RPC services.
 
-	  ftp://ftp.porcupine.org/pub/security/index.html
+	  http://neil.brown.name/portmap/
 
 comment "portmap requires a toolchain with 'Enable RPC' selected"
 	depends on !BR2_INET_RPC
package/portmap/portmap-01-5beta.patch deleted +0 -80

80 lines not on this page · raw message

package/portmap/portmap-02-4.0-malloc.patch deleted +0 -338

338 lines not on this page · raw message

package/portmap/portmap-4.0-cleanup.patch deleted +0 -85

85 lines not on this page · raw message

package/portmap/portmap-4.0-rpc_user.patch deleted +0 -59

59 lines not on this page · raw message

package/portmap/portmap-4.0-sigpipe.patch deleted +0 -12
deleted file mode 100644
index dba7cf4..0000000
@@ -1,12 +0,0 @@
---- portmap_4/portmap.c.sigpipe	Sun Feb 11 17:45:11 2001
-+++ portmap_4/portmap.c	Sun Feb 11 17:45:51 2001
-@@ -228,6 +228,9 @@
- #else
- 	(void)signal(SIGCHLD, reap);
- #endif
-+        /* Dying on SIGPIPE doesn't help anyone */
-+        (void)signal(SIGPIPE, SIG_IGN);
-+          
- 	svc_run();
- 	syslog(LOG_ERR, "run_svc returned unexpectedly");
- 	abort();
package/portmap/portmap-5b-include-errno_h.patch deleted +0 -18
deleted file mode 100644
index a440e61..0000000
@@ -1,18 +0,0 @@
---- portmap_5beta/portmap.c.orig	2002-12-31 22:13:17.000000000 +0200
-+++ portmap_5beta/portmap.c	2002-12-31 22:13:50.000000000 +0200
-@@ -97,6 +97,7 @@
- 
- extern char *strerror();
- #include <stdlib.h>
-+#include <errno.h>
- 
- #ifndef LOG_PERROR
- #define LOG_PERROR 0
-@@ -124,7 +125,6 @@
- static void callit();
- struct pmaplist *pmaplist;
- int debugging = 0;
--extern int errno;
- 
- #include "pmap_check.h"
- 
package/portmap/portmap-5b-optional-tcpd.patch deleted +0 -38
deleted file mode 100644
index d5b79f2..0000000
@@ -1,38 +0,0 @@
---- portmap/Makefile.orig	2004-10-31 01:54:48.073875024 -0400
-+++ portmap/Makefile	2004-10-31 01:54:58.395305928 -0400
-@@ -15,8 +15,6 @@
- # no access control tables. The local system, since it runs the portmap
- # daemon, is always treated as an authorized host.
- 
--HOSTS_ACCESS= -DHOSTS_ACCESS
--WRAP_LIB = $(WRAP_DIR)/libwrap.a
- 
- # Comment out if your RPC library does not allocate privileged ports for
- # requests from processes with root privilege, or the new portmap will
-@@ -87,7 +85,7 @@
- #
- AUX	= # daemon.o strerror.o
- 
--LIBS	= -lwrap -lutil
-+LIBS	= -lutil
- NSARCHS	= 
- O	= -Wall -O2 -pipe
- 
-@@ -110,7 +108,7 @@
- 
- SHELL	= /bin/sh
- 
--COPT	= $(CONST) -Dperror=xperror $(HOSTS_ACCESS) $(CHECK_PORT) \
-+COPT	= $(CONST) -Dperror=xperror $(CHECK_PORT) \
- 	$(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(SA_LEN) \
- 	$(LOOPBACK) $(SETPGRP)
- CFLAGS	= $(COPT) $(O) $(NSARCHS)
-@@ -118,7 +116,7 @@
- 
- all:	portmap pmap_dump pmap_set
- 
--portmap: $(OBJECTS) $(WRAP_DIR)/libwrap.a
-+portmap: $(OBJECTS)
- 	$(CC) $(CFLAGS) -o $@ $(OBJECTS) $(WRAP_LIB) $(LIBS)
- 
- pmap_dump: pmap_dump.c
package/portmap/portmap-6.0.0-no-tcp-wrapper.patch new file +36 -0
new file mode 100644
index 0000000..0be5ee2
@@ -0,0 +1,36 @@
+--- a/Makefile	2007-05-10 20:02:10.000000000 -0700
++++ b/Makefile	2010-10-06 13:35:16.000000000 -0700
+@@ -18,14 +18,14 @@ FACILITY=LOG_DAEMON
+ # target system will never user NIS for hostname lookup, you can define
+ # USE_DNS to add hostname tests in hosts.allow/deny.
+ 
+-ifeq ($(NO_TCP_WRAPPER),)
+-CPPFLAGS += -DHOSTS_ACCESS
+-WRAP_LIB  = -lwrap
+-ifdef USE_DNS
+-CPPFLAGS += -DENABLE_DNS
+-MAN_SED += -e 's/USE_DNS/yes/'
+-endif
+-endif
++#ifeq ($(NO_TCP_WRAPPER),)
++#CPPFLAGS += -DHOSTS_ACCESS
++#WRAP_LIB  = -lwrap
++#ifdef USE_DNS
++#CPPFLAGS += -DENABLE_DNS
++#MAN_SED += -e 's/USE_DNS/yes/'
++#endif
++#endif
+ 
+ # Comment out if your RPC library does not allocate privileged ports for
+ # requests from processes with root privilege, or the new portmap will
+
+--- a/pmap_check.c	2010-10-06 13:41:46.000000000 -0700
++++ b/pmap_check.c	2010-10-06 13:41:13.000000000 -0700
+@@ -44,7 +44,6 @@
+ #include <netinet/in.h>
+ #include <rpc/rpcent.h>
+ #endif
+-#include <tcpd.h>
+ #include <arpa/inet.h>
+ #include <grp.h>
+ 
package/portmap/portmap.mk +45 -41

90 lines not on this page · raw message

Signature · 1 line
1.7.3.1
#1 lore raw

PATCH 2/9 pptp-linux: convert to gentargets and bump to 1.7.2

---
 .../pptp-linux-1.7.0-001-susv3-legacy.patch        |   24 ------
 ...tp-linux-1.7.2-000-remove-stropts-include.patch |   15 ++++
 .../pptp-linux-1.7.2-001-susv3-legacy.patch        |   24 ++++++
 package/pptp-linux/pptp-linux.mk                   |   86 +++++--------------
 4 files changed, 62 insertions(+), 87 deletions(-)
 delete mode 100644 package/pptp-linux/pptp-linux-1.7.0-001-susv3-legacy.patch
 create mode 100644 package/pptp-linux/pptp-linux-1.7.2-000-remove-stropts-include.patch
 create mode 100644 package/pptp-linux/pptp-linux-1.7.2-001-susv3-legacy.patch
package/pptp-linux/pptp-linux-1.7.0-001-susv3-legacy.patch deleted +0 -24
deleted file mode 100644
index f41b63f..0000000
@@ -1,24 +0,0 @@
-diff -rdup pptp-linux-1.7.0/pptp_callmgr.c pptp-linux-1.7.0.orig/pptp_callmgr.c
---- pptp-linux-1.7.0/pptp_callmgr.c	2005-07-28 03:15:11.000000000 +0200
-+++ pptp-linux-1.7.0.orig/pptp_callmgr.c	2007-08-24 09:20:39.000000000 +0200
-@@ -314,7 +314,7 @@ int open_inetsock(struct in_addr inetadd
-         return s;
-     }
-     if (localbind.s_addr != INADDR_NONE) {
--        bzero(&src, sizeof(src));
-+        memset(&src, 0, sizeof(src));
-         src.sin_family = AF_INET;
-         src.sin_addr   = localbind;
-         if (bind(s, (struct sockaddr *) &src, sizeof(src)) != 0) {
-diff -rdup pptp-linux-1.7.0/pptp_gre.c pptp-linux-1.7.0.orig/pptp_gre.c
---- pptp-linux-1.7.0/pptp_gre.c	2005-07-28 03:15:11.000000000 +0200
-+++ pptp-linux-1.7.0.orig/pptp_gre.c	2007-08-24 09:20:56.000000000 +0200
-@@ -81,7 +81,7 @@ int pptp_gre_bind(struct in_addr inetadd
-     int s = socket(AF_INET, SOCK_RAW, PPTP_PROTO);
-     if (s < 0) { warn("socket: %s", strerror(errno)); return -1; }
-     if (localbind.s_addr != INADDR_NONE) {
--        bzero(&loc_addr, sizeof(loc_addr));
-+        memset(&loc_addr, 0, sizeof(loc_addr));
-         loc_addr.sin_family = AF_INET;
-         loc_addr.sin_addr   = localbind;
-         if (bind(s, (struct sockaddr *) &loc_addr, sizeof(loc_addr)) != 0) {
package/pptp-linux/pptp-linux-1.7.2-000-remove-stropts-include.patch new file +15 -0
new file mode 100644
index 0000000..ec38fbe
@@ -0,0 +1,15 @@
+Removed erronous inclusion of stropts.h. 
+
+uClibc does not provide support for streaming, and the inclusion of stropts.h
+is not needed anyway.
+
+--- a/pptp_compat.c	2008-05-13 23:33:55.000000000 -0700
++++ b/pptp_compat.c	2010-10-06 12:11:39.000000000 -0700
+@@ -7,7 +7,6 @@
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-#include <stropts.h>
+ #include <stdlib.h>
+ #include <strings.h>
+ #include "pptp_compat.h"
package/pptp-linux/pptp-linux-1.7.2-001-susv3-legacy.patch new file +24 -0
new file mode 100644
index 0000000..f41b63f
@@ -0,0 +1,24 @@
+diff -rdup pptp-linux-1.7.0/pptp_callmgr.c pptp-linux-1.7.0.orig/pptp_callmgr.c
+--- pptp-linux-1.7.0/pptp_callmgr.c	2005-07-28 03:15:11.000000000 +0200
++++ pptp-linux-1.7.0.orig/pptp_callmgr.c	2007-08-24 09:20:39.000000000 +0200
+@@ -314,7 +314,7 @@ int open_inetsock(struct in_addr inetadd
+         return s;
+     }
+     if (localbind.s_addr != INADDR_NONE) {
+-        bzero(&src, sizeof(src));
++        memset(&src, 0, sizeof(src));
+         src.sin_family = AF_INET;
+         src.sin_addr   = localbind;
+         if (bind(s, (struct sockaddr *) &src, sizeof(src)) != 0) {
+diff -rdup pptp-linux-1.7.0/pptp_gre.c pptp-linux-1.7.0.orig/pptp_gre.c
+--- pptp-linux-1.7.0/pptp_gre.c	2005-07-28 03:15:11.000000000 +0200
++++ pptp-linux-1.7.0.orig/pptp_gre.c	2007-08-24 09:20:56.000000000 +0200
+@@ -81,7 +81,7 @@ int pptp_gre_bind(struct in_addr inetadd
+     int s = socket(AF_INET, SOCK_RAW, PPTP_PROTO);
+     if (s < 0) { warn("socket: %s", strerror(errno)); return -1; }
+     if (localbind.s_addr != INADDR_NONE) {
+-        bzero(&loc_addr, sizeof(loc_addr));
++        memset(&loc_addr, 0, sizeof(loc_addr));
+         loc_addr.sin_family = AF_INET;
+         loc_addr.sin_addr   = localbind;
+         if (bind(s, (struct sockaddr *) &loc_addr, sizeof(loc_addr)) != 0) {
package/pptp-linux/pptp-linux.mk +23 -63

99 lines not on this page · raw message

Signature · 1 line
1.7.3.1
#2 lore raw

PATCH 2/9 pptp-linux: convert to gentargets and bump to 1.7.2

Quoted 1 line · On Fri, 8 Oct 2010 01:43:01 -0700 Martin Banky <[email protected]> wrote:

A similar patch from Gustavo has been merged early November.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#3 lore raw

PATCH 3/9 proftpd: convert to autotargets and bump to 1.3.3b

In reply to Martin Banky

Also, added web site to Config.in

---
 package/proftpd/Config.in                          |    1 +
 ....3.1-fix-kernel-header-capability-version.patch |   12 ---
 ...3.3b-fix-kernel-header-capability-version.patch |   12 +++
 package/proftpd/proftpd.mk                         |   83 +++++---------------
 4 files changed, 34 insertions(+), 74 deletions(-)
 delete mode 100644 package/proftpd/proftpd-1.3.1-fix-kernel-header-capability-version.patch
 create mode 100644 package/proftpd/proftpd-1.3.3b-fix-kernel-header-capability-version.patch
package/proftpd/Config.in +1 -0
index d495643..abdedc9 100644
@@ -3,3 +3,4 @@ config BR2_PACKAGE_PROFTPD
 	help
 	  ProFTPD, a highly configurable FTP server.
 
+	  http://www.proftpd.org/
package/proftpd/proftpd-1.3.1-fix-kernel-header-capability-version.patch deleted +0 -12
deleted file mode 100644
index 2899c7f..0000000
@@ -1,12 +0,0 @@
---- a/lib/libcap/libcap.h	2008-04-24 19:46:29.475883739 +0200
-+++ b/lib/libcap/libcap.h	2008-04-24 19:48:31.116088563 +0200
-@@ -52,7 +52,8 @@
-  */
- 
- #if !defined(_LINUX_CAPABILITY_VERSION) || \
--            (_LINUX_CAPABILITY_VERSION != 0x19980330)
-+           ((_LINUX_CAPABILITY_VERSION != 0x19980330) && \
-+            (_LINUX_CAPABILITY_VERSION != 0x20071026))
- 
- # error "Kernel <linux/capability.h> does not match library"
- # error "file "libcap.h" --> fix and recompile libcap"
package/proftpd/proftpd-1.3.3b-fix-kernel-header-capability-version.patch new file +12 -0
new file mode 100644
index 0000000..4401c9a
@@ -0,0 +1,12 @@
+--- a/lib/libcap/libcap.h	2008-08-22 19:49:48.000000000 -0700
++++ b/lib/libcap/libcap.h	2010-10-06 15:31:11.000000000 -0700
+@@ -65,7 +65,8 @@ struct _cap_struct {
+  */
+ 
+ #if !defined(_LINUX_CAPABILITY_VERSION_1) || \
+-            (_LINUX_CAPABILITY_VERSION_1 != 0x19980330)
++            ((_LINUX_CAPABILITY_VERSION_1 != 0x19980330) && \
++            (_LINUX_CAPABILITY_VERSION_1 != 0x20071026))
+ 
+ # error "Kernel <linux/capability.h> does not match library"
+ # error "file "libcap.h" --> fix and recompile libcap"
package/proftpd/proftpd.mk +21 -62

104 lines not on this page · raw message

Signature · 1 line
1.7.3.1
#4 lore raw

PATCH 3/9 proftpd: convert to autotargets and bump to 1.3.3b

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Martin" == Martin Banky <[email protected]> writes:

Martin> Also, added web site to Config.in
Martin> Signed-off-by: Martin Banky <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 4/9 sed: convert to autotargets

In reply to Martin Banky
---
 package/sed/sed.mk |   83 ++++++---------------------------------------------
 1 files changed, 10 insertions(+), 73 deletions(-)
package/sed/sed.mk +10 -73
index d6f53be..1a313eb 100644
@@ -3,41 +3,11 @@
 # sed
 #
 #############################################################
-SED_VERSION:=4.2.1
-SED_SOURCE:=sed-$(SED_VERSION).tar.gz
-SED_SITE:=$(BR2_GNU_MIRROR)/sed
-SED_CAT:=$(ZCAT)
-SED_DIR2:=$(BUILD_DIR)/sed-$(SED_VERSION)
-SED_BINARY:=sed/sed
-SED_TARGET_BINARY:=bin/sed
-ifeq ($(BR2_LARGEFILE),y)
-SED_CPPFLAGS=-D_FILE_OFFSET_BITS=64
-endif
+SED_VERSION = 4.2.1
+SED_SOURCE = sed-$(SED_VERSION).tar.gz
+SED_SITE = $(BR2_GNU_MIRROR)/sed
 
-$(DL_DIR)/$(SED_SOURCE):
-	mkdir -p $(DL_DIR)
-	$(call DOWNLOAD,$(SED_SITE),$(SED_SOURCE))
-
-sed-source: $(DL_DIR)/$(SED_SOURCE)
-
-$(SED_DIR2)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
-	$(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(CONFIG_UPDATE) $(SED_DIR2)/build-aux
-	touch $@
-
-$(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked
-	(cd $(SED_DIR2); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		CPPFLAGS="$(SED_CPPFLAGS)" \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
+SED_CONF_OPT = --bindir=/usr/bin \
 		--libdir=/lib \
 		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
@@ -45,45 +15,12 @@ $(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked
 		--localstatedir=/var \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--include=$(STAGING_DIR)/usr/include \
-		$(DISABLE_NLS) \
-	)
-	touch $@
-
-$(SED_DIR2)/$(SED_BINARY): $(SED_DIR2)/.configured
-	$(MAKE) -C $(SED_DIR2)
-
-# This stuff is needed to work around GNU make deficiencies
-sed-target_binary: $(SED_DIR2)/$(SED_BINARY)
-	@if [ -L $(TARGET_DIR)/$(SED_TARGET_BINARY) ]; then \
-		rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); \
-	fi
-
-	@if [ ! -f $(SED_DIR2)/$(SED_BINARY) \
-	      -o $(TARGET_DIR)/$(SED_TARGET_BINARY) \
-	      -ot $(SED_DIR2)/$(SED_BINARY) ]; then \
-		set -x; \
-		$(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(SED_DIR2) install; \
-		mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/; \
-		rm -rf $(TARGET_DIR)/share/locale; \
-		rm -rf $(TARGET_DIR)/usr/share/doc; \
-	fi
+		--include=$(STAGING_DIR)/usr/include
 
-sed: sed-target_binary
+define SED_MOVE_BINARY
+	mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/
+endef
 
-sed-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(SED_DIR2) uninstall
-	-$(MAKE) -C $(SED_DIR2) clean
+SED_POST_INSTALL_TARGET_HOOKS = SED_MOVE_BINARY
 
-sed-dirclean:
-	rm -rf $(SED_DIR2)
-
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_SED),y)
-TARGETS+=sed
-endif
+$(eval $(call AUTOTARGETS,package,sed))
Signature · 1 line
1.7.3.1
#6 lore raw

PATCH 4/9 sed: convert to autotargets

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Martin" == Martin Banky <[email protected]> writes:

Martin> Signed-off-by: Martin Banky <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH 5/9 sfdisk: convert to autotargets and change to util-linux-ng v2.18 version

In reply to Martin Banky
---
 package/sfdisk/Config.in                           |    2 +
 .../sfdisk/sfdisk.001.include_sys_syscalls_h.patch |   12 ---
 package/sfdisk/sfdisk.005.no-llseek-fix.patch      |   21 -----
 package/sfdisk/sfdisk.010.index-rindex-fix-2.patch |   45 ----------
 package/sfdisk/sfdisk.mk                           |   87 ++++++++++++--------
 5 files changed, 54 insertions(+), 113 deletions(-)
 delete mode 100644 package/sfdisk/sfdisk.001.include_sys_syscalls_h.patch
 delete mode 100644 package/sfdisk/sfdisk.005.no-llseek-fix.patch
 delete mode 100644 package/sfdisk/sfdisk.010.index-rindex-fix-2.patch
package/sfdisk/Config.in +2 -0
index d7b8fb4..a86a529 100644
@@ -2,3 +2,5 @@ config BR2_PACKAGE_SFDISK
 	bool "sfdisk"
 	help
 	  Partition table manipulator for Linux.
+
+	  http://www.kernel.org/pub/linux/utils/util-linux-ng/
package/sfdisk/sfdisk.001.include_sys_syscalls_h.patch deleted +0 -12
deleted file mode 100644
index dd35951..0000000
@@ -1,12 +0,0 @@
---- sfdisk/sfdisk.c.oorig	2006-10-09 16:24:06.000000000 +0200
-+++ sfdisk/sfdisk.c	2006-10-09 16:24:20.000000000 +0200
-@@ -47,6 +47,9 @@
- #include <sys/stat.h>
- #include <sys/utsname.h>
- #ifdef __linux__
-+#define _LIBC
-+#include <sys/syscall.h>
-+#undef _LIBC
- #include <linux/unistd.h>	/* _syscall */
- #endif
- #include "nls.h"
package/sfdisk/sfdisk.005.no-llseek-fix.patch deleted +0 -21
deleted file mode 100644
index 4ea571c..0000000
@@ -1,21 +0,0 @@
-diff -ur sfdisk_vanilla/sfdisk.c sfdisk_llseek-fix/sfdisk.c
---- sfdisk_vanilla/sfdisk.c	2004-01-13 13:03:11.000000000 +0000
-+++ sfdisk_llseek-fix/sfdisk.c	2008-04-17 08:42:35.000000000 +0000
-@@ -134,9 +137,17 @@
-  * Note: we use 512-byte sectors here, irrespective of the hardware ss.
-  */
- #if defined(__linux__) && !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__)
-+#if defined(_llseek)
- static
- _syscall5(int,  _llseek,  unsigned int,  fd, ulong, hi, ulong, lo,
-        loff_t *, res, unsigned int, wh);
-+#else
-+static int _llseek (unsigned int fd, unsigned long oh,
-+		unsigned long ol, long long *result,
-+		unsigned int origin) {
-+	return syscall (__NR__llseek, fd, oh, ol, result, origin);
-+#endif
-+}
- #endif
- 
- static int
package/sfdisk/sfdisk.010.index-rindex-fix-2.patch deleted +0 -45

45 lines not on this page · raw message

package/sfdisk/sfdisk.mk +52 -35

99 lines not on this page · raw message

Signature · 1 line
1.7.3.1
#8 lore raw

PATCH 5/9 sfdisk: convert to autotargets and change to util-linux-ng v2.18 version

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Martin" == Martin Banky <[email protected]> writes:

Martin> Signed-off-by: Martin Banky <[email protected]>

Sorry, I think I rather we deprecate this package and move the existing util-linux page forward instead.

Signature · 1 line
Bye, Peter Korsgaard
#9 lore raw

PATCH 6/9 slang: convert to gentargets

In reply to Martin Banky
---
 package/slang/slang.mk |   93 +++++++++++++++++++++++------------------------
 1 files changed, 46 insertions(+), 47 deletions(-)
package/slang/slang.mk +46 -47
index 43e910b..f6e6eb1 100644
@@ -3,51 +3,50 @@
 # slang
 #
 #############################################################
-SLANG_VERSION:=1.4.5
-SLANG_SOURCE=slang-$(SLANG_VERSION)-mini.tar.bz2
-SLANG_CAT:=$(BZCAT)
-SLANG_SITE:=http://www.uclibc.org/
-SLANG_DIR=$(BUILD_DIR)/slang-$(SLANG_VERSION)-mini
-
-$(DL_DIR)/$(SLANG_SOURCE):
-	$(call DOWNLOAD,$(SLANG_SITE),$(SLANG_SOURCE))
-
-$(SLANG_DIR): $(DL_DIR)/$(SLANG_SOURCE)
-	$(SLANG_CAT) $(DL_DIR)/$(SLANG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-
-$(SLANG_DIR)/libslang.so: $(SLANG_DIR)
-	$(MAKE1) CFLAGS="-Os -g -fPIC $(TARGET_CFLAGS)" CC="$(TARGET_CC)" -C $(SLANG_DIR)
-
-$(STAGING_DIR)/usr/lib/libslang.so.1: $(SLANG_DIR)/libslang.so
-	cp -dpf $(SLANG_DIR)/libslang.a $(STAGING_DIR)/usr/lib
-	cp -dpf $(SLANG_DIR)/libslang.so $(STAGING_DIR)/usr/lib
-	cp -dpf $(SLANG_DIR)/slang.h $(STAGING_DIR)/usr/include
-	cp -dpf $(SLANG_DIR)/slcurses.h $(STAGING_DIR)/usr/include
+SLANG_VERSION = 1.4.5
+SLANG_SOURCE = slang-$(SLANG_VERSION)-mini.tar.bz2
+SLANG_SITE = http://www.uclibc.org/
+SLANG_INSTALL_STAGING = YES
+
+define SLANG_BUILD_CMDS
+	$(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
+endef
+
+define SLANG_INSTALL_STAGING_CMDS
+	$(INSTALL) -D -m 0644 $(@D)/libslang.a $(STAGING_DIR)/usr/lib/libslang.a
+	$(INSTALL) -D -m 0755 $(@D)/libslang.so $(STAGING_DIR)/usr/lib/libslang.so
+	$(INSTALL) -D -m 0644 $(@D)/slang.h $(STAGING_DIR)/usr/include/slang.h
+	$(INSTALL) -D -m 0644 $(@D)/slcurses.h $(STAGING_DIR)/usr/include/slcurses.h
 	(cd $(STAGING_DIR)/usr/lib; ln -fs libslang.so libslang.so.1)
-	touch -c $@
-
-$(TARGET_DIR)/usr/lib/libslang.so.1: $(STAGING_DIR)/usr/lib/libslang.so.1
-	cp -dpf $(STAGING_DIR)/usr/lib/libslang.so* $(TARGET_DIR)/usr/lib/
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libslang.so*
-
-slang: $(STAGING_DIR)/usr/lib/libslang.so.1 $(TARGET_DIR)/usr/lib/libslang.so.1
-
-slang-source: $(DL_DIR)/$(SLANG_SOURCE)
-
-slang-clean:
-	rm -f $(TARGET_DIR)/usr/lib/libslang.so* $(STAGING_DIR)/usr/lib/libslang.a \
-		$(STAGING_DIR)/usr/include/slang.h \
-		$(STAGING_DIR)/usr/include/slcurses.h
-	-$(MAKE) -C $(SLANG_DIR) clean
-
-slang-dirclean:
-	rm -rf $(SLANG_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_SLANG),y)
-TARGETS+=slang
-endif
+endef
+
+define SLANG_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0644 $(@D)/libslang.a $(TARGET_DIR)/usr/lib/libslang.a
+	$(INSTALL) -D -m 0755 $(@D)/libslang.so $(TARGET_DIR)/usr/lib/libslang.so
+	$(INSTALL) -D -m 0644 $(@D)/slang.h $(TARGET_DIR)/usr/include/slang.h
+	$(INSTALL) -D -m 0644 $(@D)/slcurses.h $(TARGET_DIR)/usr/include/slcurses.h
+	(cd $(TARGET_DIR)/usr/lib; ln -fs libslang.so libslang.so.1)
+endef
+
+define SLANG_UNINSTALL_STAGING_CMDS
+	rm -f $(STAGING_DIR)/usr/lib/libslang.a
+	rm -f $(STAGING_DIR)/usr/lib/libslang.so
+	rm -f $(STAGING_DIR)/usr/lib/libslang.so.1
+	rm -f $(STAGING_DIR)/usr/include/slang.h
+	rm -f $(STAGING_DIR)/usr/include/slcurses.h
+endef
+
+define SLANG_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/lib/libslang.a
+	rm -f $(TARGET_DIR)/usr/lib/libslang.so
+	rm -f $(TARGET_DIR)/usr/lib/libslang.so.1
+	rm -f $(TARGET_DIR)/usr/include/slang.h
+	rm -f $(TARGET_DIR)/usr/include/slcurses.h
+endef
+
+define SLANG_CLEAN_CMDS
+	$(MAKE) -C $(@D) clean
+endef
+
+$(eval $(call GENTARGETS,package,slang))
Signature · 1 line
1.7.3.1
#10 lore raw

PATCH 6/9 slang: convert to gentargets

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Martin" == Martin Banky <[email protected]> writes:

Martin> Signed-off-by: Martin Banky <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#11 lore raw

PATCH 7/9 sysklogd: convert to gentargets and bump to 1.5

In reply to Martin Banky

Also, changed the site to Debian, to get the latest patches

---
 package/sysklogd/-sysklogd-susv3-legacy.patch |   20 ++++++
 package/sysklogd/-sysklogd.patch              |   91 +++++++++++++++++++++++++
 package/sysklogd/sysklogd-susv3-legacy.patch  |   20 ------
 package/sysklogd/sysklogd.mk                  |   85 +++++++++++------------
 package/sysklogd/sysklogd.patch               |   91 -------------------------
 5 files changed, 151 insertions(+), 156 deletions(-)
 create mode 100644 package/sysklogd/-sysklogd-susv3-legacy.patch
 create mode 100644 package/sysklogd/-sysklogd.patch
 delete mode 100644 package/sysklogd/sysklogd-susv3-legacy.patch
 delete mode 100644 package/sysklogd/sysklogd.patch
package/sysklogd/-sysklogd-susv3-legacy.patch new file +20 -0
new file mode 100644
index 0000000..7e9a294
@@ -0,0 +1,20 @@
+[PATCH] replace susv3 legacy functions with modern equivalents
+
+Signed-off-by: Peter Korsgaard <[email protected]>
+---
+ syslog.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: sysklogd-1.4.1/syslog.c
+===================================================================
+--- sysklogd-1.4.1.orig/syslog.c
++++ sysklogd-1.4.1/syslog.c
+@@ -178,7 +178,7 @@
+ 		return;
+ 	(void)strcat(tbuf, "\r\n");
+ 	cnt += 2;
+-	p = index(tbuf, '>') + 1;
++	p = strchr(tbuf, '>') + 1;
+ 	(void)write(fd, p, cnt - (p - tbuf));
+ 	(void)close(fd);
+ }
package/sysklogd/-sysklogd.patch new file +91 -0

91 lines not on this page · raw message

package/sysklogd/sysklogd-susv3-legacy.patch deleted +0 -20
deleted file mode 100644
index 7e9a294..0000000
@@ -1,20 +0,0 @@
-[PATCH] replace susv3 legacy functions with modern equivalents
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- syslog.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: sysklogd-1.4.1/syslog.c
-===================================================================
---- sysklogd-1.4.1.orig/syslog.c
-+++ sysklogd-1.4.1/syslog.c
-@@ -178,7 +178,7 @@
- 		return;
- 	(void)strcat(tbuf, "\r\n");
- 	cnt += 2;
--	p = index(tbuf, '>') + 1;
-+	p = strchr(tbuf, '>') + 1;
- 	(void)write(fd, p, cnt - (p - tbuf));
- 	(void)close(fd);
- }
package/sysklogd/sysklogd.mk +40 -45

99 lines not on this page · raw message

package/sysklogd/sysklogd.patch deleted +0 -91

91 lines not on this page · raw message

Signature · 1 line
1.7.3.1
#12 lore raw

PATCH 7/9 sysklogd: convert to gentargets and bump to 1.5

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Martin" == Martin Banky <[email protected]> writes:

Martin> Also, changed the site to Debian, to get the latest patches Martin> Signed-off-by: Martin Banky <[email protected]> Martin> ---

 Martin>  package/sysklogd/-sysklogd-susv3-legacy.patch |   20 ++++++
 Martin>  package/sysklogd/-sysklogd.patch              |   91 +++++++++++++++++++++++++
 Martin>  package/sysklogd/sysklogd-susv3-legacy.patch  |   20 ------
 Martin>  package/sysklogd/sysklogd.mk                  |   85 +++++++++++------------

Why this rename? If they aren't used any more, then we should simply remove them.

Signature · 1 line
Bye, Peter Korsgaard
#13 lore raw

PATCH 7/9 sysklogd: convert to gentargets and bump to 1.5

In reply to Martin Banky
Quoted 3 lines · On Fri, 8 Oct 2010 01:43:06 -0700 Martin Banky <[email protected]> wrote:

Also, changed the site to Debian, to get the latest patches

Merged into my branch, with additional fixes.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#14 lore raw

PATCH 8/9 sysvint: convert to gentargets and bump to 2.88

In reply to Martin Banky

Also, changed the site to Debian, to get the latest patches

As for the BR2_PACKAGE_UTIL_LINUX_NG variable, its in preparation for the, hopefully soon, conversion to util-linux-ng

---
 package/sysklogd/-sysklogd-susv3-legacy.patch |   20 ------
 package/sysklogd/-sysklogd.patch              |   91 -------------------------
 package/sysvinit/sysvinit-2.86-gentoo.patch   |    9 ---
 package/sysvinit/sysvinit.mk                  |   71 +++++++++----------
 4 files changed, 34 insertions(+), 157 deletions(-)
 delete mode 100644 package/sysklogd/-sysklogd-susv3-legacy.patch
 delete mode 100644 package/sysklogd/-sysklogd.patch
 delete mode 100644 package/sysvinit/sysvinit-2.86-gentoo.patch
package/sysklogd/-sysklogd-susv3-legacy.patch deleted +0 -20
deleted file mode 100644
index 7e9a294..0000000
@@ -1,20 +0,0 @@
-[PATCH] replace susv3 legacy functions with modern equivalents
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- syslog.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: sysklogd-1.4.1/syslog.c
-===================================================================
---- sysklogd-1.4.1.orig/syslog.c
-+++ sysklogd-1.4.1/syslog.c
-@@ -178,7 +178,7 @@
- 		return;
- 	(void)strcat(tbuf, "\r\n");
- 	cnt += 2;
--	p = index(tbuf, '>') + 1;
-+	p = strchr(tbuf, '>') + 1;
- 	(void)write(fd, p, cnt - (p - tbuf));
- 	(void)close(fd);
- }
package/sysklogd/-sysklogd.patch deleted +0 -91

91 lines not on this page · raw message

package/sysvinit/sysvinit-2.86-gentoo.patch deleted +0 -9
deleted file mode 100644
index 06b9e15..0000000
@@ -1,9 +0,0 @@
---- sysvinit/src/Makefile
-+++ sysvinit/src/Makefile
-@@ -10,5 +10,3 @@
- 
--CC	= gcc
--CFLAGS	= -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE
--LDFLAGS	= -s
-+CFLAGS	+= -Wall -D_GNU_SOURCE
- STATIC	=
package/sysvinit/sysvinit.mk +34 -37

84 lines not on this page · raw message

Signature · 1 line
1.7.3.1
#15 lore raw

PATCH 8/9 sysvint: convert to gentargets and bump to 2.88

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Martin" == Martin Banky <[email protected]> writes:

Martin> Also, changed the site to Debian, to get the latest patches Martin> As for the BR2_PACKAGE_UTIL_LINUX_NG variable, its in preparation for the, Martin> hopefully soon, conversion to util-linux-ng

Martin> Signed-off-by: Martin Banky <[email protected]> Martin> ---

 Martin>  package/sysklogd/-sysklogd-susv3-legacy.patch |   20 ------
 Martin>  package/sysklogd/-sysklogd.patch              |   91 -------------------------

Why?

 Martin>  package/sysvinit/sysvinit-2.86-gentoo.patch   |    9 ---
 Martin>  package/sysvinit/sysvinit.mk                  |   71 +++++++++----------
Signature · 1 line
Bye, Peter Korsgaard
#16 lore raw

PATCH 8/9 sysvint: convert to gentargets and bump to 2.88

In reply to Martin Banky
Quoted 6 lines · On Fri, 8 Oct 2010 01:43:07 -0700 Martin Banky <[email protected]> wrote:

Also, changed the site to Debian, to get the latest patches

As for the BR2_PACKAGE_UTIL_LINUX_NG variable, its in preparation for the, hopefully soon, conversion to util-linux-ng

Merged into my branch, with additional fixes.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#17 lore raw

PATCH 9/9 thttpd: convert to autotargets

In reply to Martin Banky

Also, changed the site to Debian, to get the latest patches

---
 package/thttpd/thttpd.mk |  101 +++++++++++++++++----------------------------
 1 files changed, 38 insertions(+), 63 deletions(-)
package/thttpd/thttpd.mk +38 -63
index d32462e..80eba3a 100644
@@ -3,64 +3,48 @@
 # thttpd
 #
 #############################################################
-THTTPD_VERSION:=2.25b
-THTTPD_SOURCE:=thttpd-$(THTTPD_VERSION).tar.gz
-THTTPD_SITE:=http://www.acme.com/software/thttpd/
-THTTPD_DIR:=$(BUILD_DIR)/thttpd-$(THTTPD_VERSION)
-THTTPD_CAT:=$(ZCAT)
-THTTPD_BINARY:=thttpd
-THTTPD_TARGET_BINARY:=sbin/thttpd
-THTTPD_ROOT:=/var
-THTTPD_WEB_DIR:=$(THTTPD_ROOT)/www
-
-$(DL_DIR)/$(THTTPD_SOURCE):
-	$(call DOWNLOAD,$(THTTPD_SITE),$(THTTPD_SOURCE))
-
-thttpd-source: $(DL_DIR)/$(THTTPD_SOURCE)
-
-$(THTTPD_DIR)/.unpacked: $(DL_DIR)/$(THTTPD_SOURCE)
-	$(THTTPD_CAT) $(DL_DIR)/$(THTTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(THTTPD_DIR)/.unpacked
+THTTPD_VERSION = 2.25b
+THTTPD_SOURCE = thttpd_$(THTTPD_VERSION).orig.tar.gz
+THTTPD_PATCH = thttpd_$(THTTPD_VERSION)-11.diff.gz
+THTTPD_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/t/thttpd/
+
+ifneq ($(THTTPD_PATCH),)
+define THTTPD_DEBIAN_PATCHES
+	if [ -d $(@D)/debian/patches ]; then \
+		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+	fi
+endef
+endif
 
-$(THTTPD_DIR)/.configured: $(THTTPD_DIR)/.unpacked
-	(cd $(THTTPD_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=$(THTTPD_ROOT) \
-	)
-	touch $(THTTPD_DIR)/.configured
+THTTPD_POST_PATCH_HOOKS = THTTPD_DEBIAN_PATCHES
 
-$(THTTPD_DIR)/$(THTTPD_BINARY): $(THTTPD_DIR)/.configured
-	$(MAKE1) -C $(THTTPD_DIR)
+THTTPD_MAKE=$(MAKE1)
 
-$(TARGET_DIR)/$(THTTPD_TARGET_BINARY): $(THTTPD_DIR)/$(THTTPD_BINARY)
-	install -D $(THTTPD_DIR)/$(THTTPD_BINARY) $(TARGET_DIR)/$(THTTPD_TARGET_BINARY)
-	install -D $(THTTPD_DIR)/extras/htpasswd $(TARGET_DIR)/bin/htpasswd
-	install -D $(THTTPD_DIR)/extras/makeweb $(TARGET_DIR)/bin/makeweb
-	install -D $(THTTPD_DIR)/extras/syslogtocern $(TARGET_DIR)/bin/syslogtocern
-	install -D $(THTTPD_DIR)/scripts/thttpd_wrapper $(TARGET_DIR)/sbin/thttpd_wrapper
-	install -D $(THTTPD_DIR)/scripts/thttpd.sh $(TARGET_DIR)/etc/init.d/S90thttpd
+define THTTPD_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/thttpd $(TARGET_DIR)/sbin/thttpd
+	$(INSTALL) -D -m 0755 $(@D)/extras/htpasswd $(TARGET_DIR)/bin/htpasswd
+	$(INSTALL) -D -m 0755 $(@D)/extras/makeweb $(TARGET_DIR)/bin/makeweb
+	$(INSTALL) -D -m 0755 $(@D)/extras/syslogtocern $(TARGET_DIR)/bin/syslogtocern
+	$(INSTALL) -D -m 0755 $(@D)/scripts/thttpd_wrapper $(TARGET_DIR)/sbin/thttpd_wrapper
+	$(INSTALL) -D -m 0755 $(@D)/scripts/thttpd.sh $(TARGET_DIR)/etc/init.d/S90thttpd
 	cp $(TARGET_DIR)/etc/init.d/S90thttpd $(TARGET_DIR)/etc/init.d/S90thttpd.in
 	cp $(TARGET_DIR)/sbin/thttpd_wrapper $(TARGET_DIR)/sbin/thttpd_wrapper.in
-	sed -e "s:/usr/local/sbin:/sbin:g" -e "s:/usr/local/www:$(THTTPD_WEB_DIR):g" < $(TARGET_DIR)/sbin/thttpd_wrapper.in > $(TARGET_DIR)/sbin/thttpd_wrapper
-	sed -e "s:/usr/local/sbin:/sbin:g" < $(TARGET_DIR)/etc/init.d/S90thttpd.in > $(TARGET_DIR)/etc/init.d/S90thttpd
+	sed -e "s:/usr/local/sbin:/sbin:g" -e "s:/usr/local/www:/var/www:g" \
+		< $(TARGET_DIR)/sbin/thttpd_wrapper.in > $(TARGET_DIR)/sbin/thttpd_wrapper
+	sed -e "s:/usr/local/sbin:/sbin:g" < $(TARGET_DIR)/etc/init.d/S90thttpd.in \
+		> $(TARGET_DIR)/etc/init.d/S90thttpd
 	rm -f $(TARGET_DIR)/etc/init.d/S90thttpd.in $(TARGET_DIR)/sbin/thttpd_wrapper.in
-	install -d $(TARGET_DIR)$(THTTPD_WEB_DIR)/data
-	install -d $(TARGET_DIR)$(THTTPD_WEB_DIR)/logs
-	echo "dir=$(THTTPD_WEB_DIR)/data" > $(TARGET_DIR)$(THTTPD_WEB_DIR)/thttpd_config
-	echo 'cgipat=**.cgi' >> $(TARGET_DIR)$(THTTPD_WEB_DIR)/thttpd_config
-	echo "logfile=$(THTTPD_WEB_DIR)/logs/thttpd_log" >> $(TARGET_DIR)$(THTTPD_WEB_DIR)/thttpd_config
-	echo "pidfile=/var/run/thttpd.pid" >> $(TARGET_DIR)$(THTTPD_WEB_DIR)/thttpd_config
-	echo "<HTML><BODY>thttpd test page</BODY></HTML>" > $(TARGET_DIR)$(THTTPD_WEB_DIR)/data/index.html
-
-thttpd: $(TARGET_DIR)/$(THTTPD_TARGET_BINARY)
-
-thttpd-clean:
-	rm -f $(TARGET_DIR)/$(THTTPD_TARGET_BINARY)
+	$(INSTALL) -d $(TARGET_DIR)/var/www/data
+	$(INSTALL) -d $(TARGET_DIR)/var/www/logs
+	echo "dir=/var/www/data" > $(TARGET_DIR)/var/www/thttpd_config
+	echo 'cgipat=**.cgi' >> $(TARGET_DIR)/var/www/thttpd_config
+	echo "logfile=/var/www/logs/thttpd_log" >> $(TARGET_DIR)/var/www/thttpd_config
+	echo "pidfile=/var/run/thttpd.pid" >> $(TARGET_DIR)/var/www/thttpd_config
+	echo "<HTML><BODY>thttpd test page</BODY></HTML>" > $(TARGET_DIR)/var/www/data/index.html
+endef
+
+define THTTPD_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/sbin/thttpd
 	rm -f $(TARGET_DIR)/sbin/httpd_wrapper
 	rm -f $(TARGET_DIR)/sbin/thttpd_wrapper
 	rm -rf $(TARGET_DIR)/var/www
@@ -68,15 +52,6 @@ thttpd-clean:
 	rm -f $(TARGET_DIR)/bin/htpasswd
 	rm -f $(TARGET_DIR)/bin/makeweb
 	rm -f $(TARGET_DIR)/bin/syslogtocern
-	-$(MAKE) -C $(THTTPD_DIR) clean
+endef
 
-thttpd-dirclean:
-	rm -rf $(THTTPD_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_THTTPD),y)
-TARGETS+=thttpd
-endif
+$(eval $(call AUTOTARGETS,package,thttpd))
Signature · 1 line
1.7.3.1
#18 lore raw

PATCH 9/9 thttpd: convert to autotargets

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Martin" == Martin Banky <[email protected]> writes:

Martin> Also, changed the site to Debian, to get the latest patches Martin> Signed-off-by: Martin Banky <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#20 lore raw

PATCH 1/9 portmap: convert to gentargets and bump to 6.0.0

In reply to Martin Banky
Quoted 3 lines · On Fri, 8 Oct 2010 01:43:00 -0700 Martin Banky <[email protected]> wrote:

portmap has a new maintainer, Neil Brown, who has made some updates to portmap. Also, changed the download location to Debian to get the latest patches.

A different patch from Gustavo that bumps portmap to 6.0 and that converts it to GENTARGETS has been merged.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com