All of lore.kernel.org
 help / color / mirror / Atom feed
From: Khem Raj <raj.khem@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-networking][PATCH 38/43] arptables: Upgrade to 0.0.4
Date: Fri, 31 Mar 2017 09:42:42 -0700	[thread overview]
Message-ID: <20170331164247.5052-38-raj.khem@gmail.com> (raw)
In-Reply-To: <20170331164247.5052-1-raj.khem@gmail.com>

Switch the SRC_URI to git based fetcher

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../arptables-compile-install.patch                | 61 -----------------
 ...FLAGS-for-package-specific-compiler-flags.patch | 79 ++++++++++++++++++++++
 .../arptables-arpt-get-target-fix.patch            |  0
 .../arptables-init-busybox.patch                   |  0
 .../arptables-remove-bashism.patch                 |  0
 .../arptables.service                              |  0
 .../{arptables_0.0.3-4.bb => arptables_git.bb}     | 43 ++++++------
 7 files changed, 98 insertions(+), 85 deletions(-)
 delete mode 100644 meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch
 create mode 100644 meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch
 rename meta-networking/recipes-support/arptables/{arptables-0.0.3-4 => arptables}/arptables-arpt-get-target-fix.patch (100%)
 rename meta-networking/recipes-support/arptables/{arptables-0.0.3-4 => arptables}/arptables-init-busybox.patch (100%)
 rename meta-networking/recipes-support/arptables/{arptables-0.0.3-4 => arptables}/arptables-remove-bashism.patch (100%)
 rename meta-networking/recipes-support/arptables/{arptables-0.0.3-4 => arptables}/arptables.service (100%)
 rename meta-networking/recipes-support/arptables/{arptables_0.0.3-4.bb => arptables_git.bb} (61%)

diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch b/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch
deleted file mode 100644
index 80e980472..000000000
--- a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: arptables-v0.0.3-4/Makefile
-===================================================================
---- arptables-v0.0.3-4.orig/Makefile	2010-03-08 18:49:28.000000000 +0300
-+++ arptables-v0.0.3-4/Makefile	2010-03-22 15:52:56.000000000 +0300
-@@ -6,12 +6,11 @@
- LIBDIR:=$(PREFIX)/lib
- BINDIR:=$(PREFIX)/sbin
- MANDIR:=$(PREFIX)/man
--INITDIR:=/etc/rc.d/init.d
-+INITDIR:=/etc/init.d
- SYSCONFIGDIR:=/etc/sysconfig
- DESTDIR:=
- 
--COPT_FLAGS:=-O2
--CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG
-+ARPCFLAGS:=-Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\"
- 
- ifndef ARPT_LIBDIR
- ARPT_LIBDIR:=$(LIBDIR)/arptables
-@@ -22,16 +21,16 @@
- all: arptables
- 
- arptables.o: arptables.c
--	$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $<
- 
- arptables-standalone.o: arptables-standalone.c
--	$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $<
- 
- libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c
--	$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $<
- 
- arptables: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS)
--	$(CC) $(CFLAGS) -o $@ $^
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(ARPCFLAGS) -o $@ $^
- 
- $(DESTDIR)$(MANDIR)/man8/arptables.8: arptables.8
- 	mkdir -p $(@D)
-@@ -50,6 +49,7 @@
- 	cat arptables-restore | sed 's/__EXEC_PATH__/$(tmp1)/g' > arptables-restore_
- 	install -m 0755 -o root -g root arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore
- 	cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_
-+	install -d $(DESTDIR)$(INITDIR)
- 	if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi
- 	rm -f arptables-save_ arptables-restore_ arptables.sysv_
- 
-Index: arptables-v0.0.3-4/extensions/Makefile
-===================================================================
---- arptables-v0.0.3-4.orig/extensions/Makefile	2010-03-08 18:49:28.000000000 +0300
-+++ arptables-v0.0.3-4/extensions/Makefile	2010-03-22 15:52:38.000000000 +0300
-@@ -4,4 +4,7 @@
- EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o)
- 
- extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h
--	$(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $<
-+	$(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $<
-+
-+extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h
-+	$(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $<
diff --git a/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch
new file mode 100644
index 000000000..e8be45e6b
--- /dev/null
+++ b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch
@@ -0,0 +1,79 @@
+From a2021f0bc0f029dfa05dcca5db3d2ec77904d41a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 30 Mar 2017 12:33:51 -0700
+Subject: [PATCH] Use ARPCFLAGS for package specific compiler flags
+
+This leaves room for setting CFLAGS in environment
+which OE uses to pass tweaks
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile            | 15 +++++++--------
+ extensions/Makefile |  5 ++++-
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7bead0d..336db6b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,15 +7,13 @@ LIBDIR:=$(PREFIX)/lib
+ BINDIR:=$(PREFIX)/sbin
+ MANDIR:=$(PREFIX)/man
+ man8dir=$(MANDIR)/man8
+-INITDIR:=/etc/rc.d/init.d
++INITDIR:=/etc/init.d
+ SYSCONFIGDIR:=/etc/sysconfig
+ DESTDIR:=
+ 
+ MANS = arptables.8 arptables-save.8 arptables-restore.8
+ 
+-COPT_FLAGS:=-O2
+-CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG
+-
++ARPCFLAGS:=-Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\"
+ ifndef ARPT_LIBDIR
+ ARPT_LIBDIR:=$(LIBDIR)/arptables
+ endif
+@@ -25,13 +23,13 @@ include extensions/Makefile
+ all: arptables libarptc/libarptc.a
+ 
+ arptables.o: arptables.c
+-	$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $<
+ 
+ arptables-standalone.o: arptables-standalone.c
+-	$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $<
+ 
+ libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c
+-	$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $<
+ 
+ libarptc/libarptc.a: libarptc/libarptc.o
+ 	$(AR) rcs $@ $<
+@@ -53,7 +51,8 @@ scripts: arptables-save arptables-restore arptables.sysv
+ 	install -m 0755 arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore
+ 	cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_
+ 	if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi
+-	if test -d $(DESTDIR)$(INITDIR); then install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi
++	install -d $(DESTDIR)$(INITDIR)
++	install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables
+ 	rm -f arptables-save_ arptables-restore_ arptables.sysv_
+ 
+ .PHONY: install-man
+diff --git a/extensions/Makefile b/extensions/Makefile
+index 0189cc9..b046425 100644
+--- a/extensions/Makefile
++++ b/extensions/Makefile
+@@ -4,4 +4,7 @@ EXT_FUNC+=standard mangle CLASSIFY MARK
+ EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o)
+ 
+ extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h
+-	$(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $<
++	$(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $<
++
++extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h
++	$(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $<
+-- 
+2.12.1
+
diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-arpt-get-target-fix.patch b/meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch
similarity index 100%
rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-arpt-get-target-fix.patch
rename to meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch
diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-init-busybox.patch b/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch
similarity index 100%
rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-init-busybox.patch
rename to meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch
diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch b/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch
similarity index 100%
rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch
rename to meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch
diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables.service b/meta-networking/recipes-support/arptables/arptables/arptables.service
similarity index 100%
rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables.service
rename to meta-networking/recipes-support/arptables/arptables/arptables.service
diff --git a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb b/meta-networking/recipes-support/arptables/arptables_git.bb
similarity index 61%
rename from meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb
rename to meta-networking/recipes-support/arptables/arptables_git.bb
index f53640847..274a55d91 100644
--- a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb
+++ b/meta-networking/recipes-support/arptables/arptables_git.bb
@@ -1,15 +1,13 @@
 SUMMARY = "Administration tool for arp packet filtering"
-LICENSE = "GPL-2.0"
 SECTION = "net"
-
-PR = "r2"
-
-RDEPENDS_${PN} += "perl"
-
+LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+SRCREV = "f4ab8f63f11a72f14687a6646d04ae1bae3fa45f"
+PV = "0.0.4+git${SRCPV}"
+
 SRC_URI = " \
-    ${SOURCEFORGE_MIRROR}/ebtables/arptables-v${PV}.tar.gz;name=arptables \
-    file://arptables-compile-install.patch \
+    git://git.netfilter.org/arptables \
+    file://0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch \
     file://arptables-init-busybox.patch \
     file://arptables-arpt-get-target-fix.patch \
     file://arptables-remove-bashism.patch \
@@ -18,26 +16,23 @@ SRC_URI = " \
 SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5"
 SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928"
 
-S = "${WORKDIR}/arptables-v${PV}"
-
-do_compile () {
-    oe_runmake
-}
+S = "${WORKDIR}/git"
+SYSTEMD_SERVICE_${PN} = "arptables.service"
 
-# the install target is not multi-job safe, but it doesn't do much
-# so we just install serially
-#
-PARALLEL_MAKEINST = "-j1"
+inherit systemd
 
-fakeroot do_install () {
-    oe_runmake 'BINDIR=${sbindir}' 'MANDIR=${mandir}/' 'DESTDIR=${D}' install
-}
+EXTRA_OEMAKE = "'BINDIR=${sbindir}' 'MANDIR=${mandir}'"
 
 do_install_append() {
-    install -d ${D}${systemd_unitdir}/system
-    install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        install -d ${D}${systemd_unitdir}/system
+        install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system
+    fi
 }
 
-inherit systemd
+RDEPENDS_${PN} += "perl"
 
-SYSTEMD_SERVICE_${PN} = "arptables.service"
+# the install target is not multi-job safe, but it doesn't do much
+# so we just install serially
+#
+PARALLEL_MAKEINST = "-j1"
-- 
2.12.1



  parent reply	other threads:[~2017-03-31 16:43 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-31 16:42 [meta-oe][PATCH 01/43] gpm: Update to use git src uri Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 02/43] netcat-openbsd: Fix build and whitelist Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 03/43] ctdb: Fix build with musl Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 04/43] v4l-utils: Depend on argp-standalone for musl Khem Raj
2017-03-31 16:42 ` [meta-multimedia][PATCH 05/43] caps: Use c99 int types Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 06/43] lvm2: Fix patch errors found with musl Khem Raj
2017-04-01  3:50   ` Peter Kjellerstedt
2017-04-01 15:20     ` Khem Raj
2017-04-05 17:17       ` Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 07/43] squid: Update to 3.5.23 Khem Raj
2017-03-31 16:42 ` [meta-xfce][PATCH 08/43] xfce4-closebutton-plugin: Fix build with clang Khem Raj
2017-03-31 16:42 ` [meta-xfce][PATCH 09/43] xfce4-timer-plugin: Fix build when security flags are enabled " Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 10/43] tcsh: Update to 6.20.00 release Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 11/43] libnfnetlink: Backport patches to fix musl build Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 12/43] ebtables: Fix build with musl Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 13/43] poco: Upgrade to 1.7.8 Khem Raj
2017-04-07 17:42   ` Martin Jansa
2017-04-07 22:21     ` Khem Raj
2017-04-07 23:43       ` Khem Raj
2017-04-08  7:20         ` Martin Jansa
2017-03-31 16:42 ` [meta-oe][PATCH 14/43] mariadb: Do not use ucontext_* APIs with musl Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 15/43] lowpan-tools: Fix build " Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 16/43] usb-modeswitch-data: Add dep on native tcl Khem Raj
2017-03-31 16:42 ` [meta-filesystems][PATCH 17/43] aufs-util: Define HOSTCC Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 18/43] ttf-inconsolata: Move copying of .otf to .ttf into do_compile Khem Raj
2017-04-02  7:14   ` Martin Jansa
2017-04-05 16:56     ` Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 19/43] libraw1394: Update to 2.1.2 release Khem Raj
2017-03-31 16:42 ` [meta-multimedia][PATCH 20/43] libdc1394: Update to 2.2.5+ Khem Raj
2017-03-31 16:42 ` [meta-filesystems][PATCH 21/43] ntfs-3g-ntfsprogs: Upgrade to 2017.3.23 Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 22/43] openl2tp: Fix build with musl Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 23/43] rp-pppoe: " Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 24/43] minicoredumper: Update to 2.0.0 Khem Raj
2017-04-02  7:14   ` Martin Jansa
2017-04-05 17:05     ` Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 25/43] vsftpd: Fix build with musl Khem Raj
2017-03-31 16:42 ` [meta-multimedia][PATCH 26/43] faac: Fix with with security flags and on musl Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 27/43] dibbler: Upgrade to 1.0.2RC1 Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 28/43] live555: Do not use XLOCALE on musl Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 29/43] libqb: Upgrade to 1.0.1 release Khem Raj
2017-04-03 14:18   ` Martin Jansa
2017-04-05 16:49     ` Khem Raj
2017-04-06  7:30       ` Martin Jansa
2017-03-31 16:42 ` [meta-oe][PATCH 30/43] libgxim: Fix build with security flags turned on Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 31/43] vpnc: Update to build from github SRC_URI Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 32/43] daq: Fix build with musl Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 33/43] utouch: Fix build on musl Khem Raj
2017-03-31 16:42 ` [meta-multimedia][PATCH 34/43] libavc1394: Add libargp " Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH V2 35/43] picocom: Upgrade to 2.2 Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH V2 36/43] libexecinfo: Add recipe Khem Raj
2017-03-31 16:42 ` [meta-xfce][PATCH 37/43] xarchiver: Fix build with security flags turned on Khem Raj
2017-04-02  7:16   ` Martin Jansa
2017-04-05 17:14     ` Khem Raj
2017-03-31 16:42 ` Khem Raj [this message]
2017-03-31 16:42 ` [meta-networking][PATCH 39/43] libnetfilter-log: Switch to git URI Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 40/43] lxdm: Find libexecinfo if its on platform Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 41/43] libnetfilter-queue: Update to git for SRC_URI Khem Raj
2017-03-31 16:42 ` [meta-oe][PATCH 42/43] libunique: Fix build with secutiy flags on Khem Raj
2017-03-31 16:42 ` [meta-networking][PATCH 43/43] snort: Fix build with musl Khem Raj
2017-04-03 19:19 ` [meta-oe][PATCH 01/43] gpm: Update to use git src uri Martin Jansa
2017-04-05 16:38   ` Khem Raj
2017-04-05 17:41     ` Martin Jansa
2017-04-05 17:57       ` Khem Raj
2017-04-05 17:58       ` Khem Raj
2017-04-05 18:36         ` Martin Jansa
2017-04-05 19:37           ` Khem Raj

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170331164247.5052-38-raj.khem@gmail.com \
    --to=raj.khem@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.