gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lsof: convert to gentargets and bump to 4.84

Browse Source 
lsof is packaged as a tarball inside a .tar.bz2 package, so we have a
post-extract hook to extract the source code tarball, so that for the
next steps, lsof looks like a normal package.

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Martin Banky 2010-12-12 22:53:53 +01:00 committed by Peter Korsgaard
parent fb7226ca2f
commit 8db52c6e78
7 changed files with 58 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGES
View File

@ -5,10 +5,10 @@
Updated/fixed packages: at, busybox, bzip2, dbus, Updated/fixed packages: at, busybox, bzip2, dbus,
direcfb-examples, dmalloc, cloop, cups, ffmpeg, gdk-pixbuf, direcfb-examples, dmalloc, cloop, cups, ffmpeg, gdk-pixbuf,
hostapd, i2c-tools, input-tools, libconfig, ltp-testsuite, m4, hostapd, i2c-tools, input-tools, libconfig, lsof,
mii-diag, mrouted, openssh, openssl, openvpn, pango, qt, ltp-testsuite, m4, mii-diag, mrouted, openssh, openssl,
rsync, sdl_gfx, sdl_sound, sysklogd, sysvinit, udev, usbutils, openvpn, pango, qt, rsync, sdl_gfx, sdl_sound, sysklogd,
xz, zlib sysvinit, udev, usbutils, xz, zlib
New packages: dhrystone, fbgrab, lsuio, rsh-redone, whetstone New packages: dhrystone, fbgrab, lsuio, rsh-redone, whetstone

4
package/lsof/lsof-makefile.patch → package/lsof/lsof-4.84-makefile.patch
View File

@ -1,6 +1,6 @@
diff -ru lsof_4.81.orig/lsof_4.81_src/lib/Makefile.skel lsof_4.81/lsof_4.81_src/lib/Makefile.skel diff -ru lsof_4.81.orig/lsof_4.81_src/lib/Makefile.skel lsof_4.81/lsof_4.81_src/lib/Makefile.skel
--- lsof_4.81.orig/lsof_4.81_src/lib/Makefile.skel 2001-02-13 03:12:22.000000000 +0100 --- a/lib/Makefile.skel 2001-02-13 03:12:22.000000000 +0100
+++ lsof_4.81/lsof_4.81_src/lib/Makefile.skel 2006-11-29 13:51:44.000000000 +0100 +++ b/lib/Makefile.skel 2006-11-29 13:51:44.000000000 +0100
@@ -21,8 +21,8 @@ @@ -21,8 +21,8 @@
all: ${LIB} all: ${LIB}

4
package/lsof/lsof-noportmap.patch → package/lsof/lsof-4.84-noportmap.patch
View File

@ -1,5 +1,5 @@
--- lsof_4.81/lsof_4.81_src/print.orig.c 2006-08-23 13:37:43.000000000 -0600 --- a/print.c 2006-08-23 13:37:43.000000000 -0600
+++ lsof_4.81/lsof_4.81_src/print.c 2006-08-23 13:38:29.000000000 -0600 +++ b/print.c 2006-08-23 13:38:29.000000000 -0600
@@ -148,6 +148,7 @@ @@ -148,6 +148,7 @@
static void static void
fill_portmap() fill_portmap()

4
package/lsof/lsof-override-cflags.patch → package/lsof/lsof-4.84-override-cflags.patch
View File

@ -1,5 +1,5 @@
--- lsof_4.81/lsof_4.81_src/Configure 2008-10-21 18:21:45.000000000 +0200 --- lsof_4.84/Configure 2008-10-21 18:21:45.000000000 +0200
+++ lsof_4.81/lsof_4.81_src/Configure 2010-11-03 14:00:00.000000000 +0100 +++ lsof_4.84/Configure 2010-11-03 14:00:00.000000000 +0100
@@ -5206,6 +5206,10 @@ @@ -5206,6 +5206,10 @@
cp $LSOF_MKFC ${LSOF_LIB}/$LSOF_LIBMKF cp $LSOF_MKFC ${LSOF_LIB}/$LSOF_LIBMKF
fi # } fi # }

4
package/lsof/lsof-remove-susvlegacy-funcs.patch → package/lsof/lsof-4.84-remove-susvlegacy-funcs.patch
View File

@ -1,6 +1,6 @@
diff -rdup lsof_4.81.orig/lsof_4.81_src/dialects/linux/machine.h lsof_4.81/lsof_4.81_src/dialects/linux/machine.h diff -rdup lsof_4.81.orig/lsof_4.81_src/dialects/linux/machine.h lsof_4.81/lsof_4.81_src/dialects/linux/machine.h
--- lsof_4.81.orig/lsof_4.81_src/dialects/linux/machine.h 2007-04-24 18:20:58.000000000 +0200 --- a/dialects/linux/machine.h 2007-04-24 18:20:58.000000000 +0200
+++ lsof_4.81/lsof_4.81_src/dialects/linux/machine.h 2007-05-15 12:17:03.000000000 +0200 +++ b/dialects/linux/machine.h 2007-05-15 12:17:03.000000000 +0200
@@ -616,6 +616,6 @@ @@ -616,6 +616,6 @@
* zeromem is a macro that uses bzero or memset. * zeromem is a macro that uses bzero or memset.
*/ */

12
package/lsof/lsof-uclibc.patch
View File

@ -1,12 +0,0 @@
diff -ru lsof_4.81.orig/lsof_4.81_src/dialects/linux/dlsof.h lsof_4.81/lsof_4.81_src/dialects/linux/dlsof.h
--- lsof_4.81.orig/lsof_4.81_src/dialects/linux/dlsof.h 2006-03-28 00:57:14.000000000 +0200
+++ lsof_4.81/lsof_4.81_src/dialects/linux/dlsof.h 2006-11-29 14:03:07.000000000 +0100
@@ -49,7 +49,7 @@
#include <unistd.h>
#include <netinet/in.h>
-# if defined(GLIBCV)
+# if defined(GLIBCV) || defined __UCLIBC__
#include <netinet/tcp.h>
# else /* !defined(GLIBCV) */
#include <linux/tcp.h>

96
package/lsof/lsof.mk
View File

@ -3,68 +3,64 @@
# lsof # lsof
# #
############################################################# #############################################################
LSOF_VERSION:=4.81 LSOF_VERSION = 4.84
LSOF_SOURCE:=lsof_$(LSOF_VERSION).tar.bz2 LSOF_SOURCE = lsof_$(LSOF_VERSION).tar.bz2
LSOF_SITE:=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ LSOF_SITE = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
LSOF_CAT:=$(BZCAT)
LSOF_DIR:=$(BUILD_DIR)/lsof_$(LSOF_VERSION)
LSOF_BINARY:=lsof
LSOF_TARGET_BINARY:=bin/lsof
LSOF_INCLUDE:=$(STAGING_DIR)/usr/include
BR2_LSOF_CFLAGS:= BR2_LSOF_CFLAGS =
ifeq ($(BR2_LARGEFILE),) ifeq ($(BR2_LARGEFILE),)
BR2_LSOF_CFLAGS+=-U_FILE_OFFSET_BITS BR2_LSOF_CFLAGS += -U_FILE_OFFSET_BITS
endif endif
ifeq ($(BR2_INET_IPV6),) ifeq ($(BR2_INET_IPV6),)
BR2_LSOF_CFLAGS+=-UHASIPv6 BR2_LSOF_CFLAGS += -UHASIPv6
endif endif
$(DL_DIR)/$(LSOF_SOURCE):
$(call DOWNLOAD,$(LSOF_SITE),$(LSOF_SOURCE))
lsof-source: $(DL_DIR)/$(LSOF_SOURCE)
lsof-unpacked: $(LSOF_DIR)/.unpacked
$(LSOF_DIR)/.unpacked: $(DL_DIR)/$(LSOF_SOURCE)
$(LSOF_CAT) $(DL_DIR)/$(LSOF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
(cd $(LSOF_DIR);tar xf lsof_$(LSOF_VERSION)_src.tar;rm -f lsof_$(LSOF_VERSION)_src.tar)
toolchain/patch-kernel.sh $(LSOF_DIR) package/lsof/ \*.patch
touch $(LSOF_DIR)/.unpacked
$(LSOF_DIR)/.configured: $(LSOF_DIR)/.unpacked
(cd $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src; echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" LSOF_INCLUDE="$(LSOF_INCLUDE)" LSOF_CFLAGS_OVERRIDE=1 ./Configure linux)
touch $(LSOF_DIR)/.configured
$(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/$(LSOF_BINARY): $(LSOF_DIR)/.configured
ifeq ($(BR2_USE_WCHAR),) ifeq ($(BR2_USE_WCHAR),)
$(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h define LSOF_CONFIGURE_WCHAR_FIXUPS
$(SED) 's,^#define[[:space:]]*WIDECHARINCL.*,,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h $(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' \
$(@D)/lsof_$(LSOF_VERSION)_src/machine.h
$(SED) 's,^#define[[:space:]]*WIDECHARINCL.*,,' \
$(@D)/lsof_$(LSOF_VERSION)_src/machine.h
endef
endif endif
ifeq ($(BR2_ENABLE_LOCALE),) ifeq ($(BR2_ENABLE_LOCALE),)
$(SED) 's,^#define[[:space:]]*HASSETLOCALE.*,#undef HASSETLOCALE,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h define LSOF_CONFIGURE_LOCALE_FIXUPS
$(SED) 's,^#define[[:space:]]*HASSETLOCALE.*,#undef HASSETLOCALE,' \
$(@D)/lsof_$(LSOF_VERSION)_src/machine.h
endef
endif endif
$(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" -C $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src
$(TARGET_DIR)/$(LSOF_TARGET_BINARY): $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/$(LSOF_BINARY) # The .tar.bz2 contains another .tar, which contains the source code.
cp $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/$(LSOF_BINARY) $@ define LSOF_EXTRACT_TAR
$(STRIPCMD) $@ $(TAR) $(TAR_STRIP_COMPONENTS)=1 -xf $(@D)/lsof_$(LSOF_VERSION)_src.tar -C $(@D)
rm -f $(@D)/lsof_$(LSOF_VERSION)_src.tar
endef
lsof: $(TARGET_DIR)/$(LSOF_TARGET_BINARY) LSOF_POST_EXTRACT_HOOKS += LSOF_EXTRACT_TAR
lsof-clean: define LSOF_CONFIGURE_CMDS
-rm -f $(TARGET_DIR)/$(LSOF_TARGET_BINARY) (cd $(@D) ; \
-$(MAKE) -C $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src clean echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" \
LSOF_INCLUDE="$(STAGING_DIR)/usr/include" LSOF_CFLAGS_OVERRIDE=1 ./Configure linux)
$(LSOF_CONFIGURE_WCHAR_FIXUPS)
$(LSOF_CONFIGURE_LOCALE_FIXUPS)
endef
lsof-dirclean: define LSOF_BUILD_CMDS
rm -rf $(LSOF_DIR) $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" -C $(@D)
endef
############################################################# define LSOF_INSTALL_TARGET_CMDS
# install -D -m 755 $(@D)/lsof $(TARGET_DIR)/bin/lsof
# Toplevel Makefile options endef
#
############################################################# define LSOF_UNINSTALL_TARGET_CMDS
ifeq ($(BR2_PACKAGE_LSOF),y) rm -f $(TARGET_DIR)/bin/lsof
TARGETS+=lsof endef
endif
define LSOF_CLEAN_CMDS
-$(MAKE) -C $(@D)/lsof_$(LSOF_VERSION)_src clean
endef
$(eval $(call GENTARGETS,package,lsof))