CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

arptables: Upgrade to 0.0.4

Browse Source 
Switch the SRC_URI to git based fetcher

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Khem Raj 2017-03-30 12:39:45 -07:00 committed by Joe MacDonald
parent 9e69cd9c18
commit a8d26915e8
7 changed files with 98 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch
View File

@ -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 $@ $<

79
meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch Normal file
View File

@ -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

0
meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-arpt-get-target-fix.patch → meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch
View File

0
meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-init-busybox.patch → meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch
View File

0
meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch → meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch
View File

0
meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables.service → meta-networking/recipes-support/arptables/arptables/arptables.service
View File

43
meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb → meta-networking/recipes-support/arptables/arptables_git.bb
View File

@ -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}"
S = "${WORKDIR}/git"
SYSTEMD_SERVICE_${PN} = "arptables.service"
do_compile () {
oe_runmake
inherit systemd
EXTRA_OEMAKE = "'BINDIR=${sbindir}' 'MANDIR=${mandir}'"
do_install_append() {
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
}
RDEPENDS_${PN} += "perl"
# the install target is not multi-job safe, but it doesn't do much
# so we just install serially
#
PARALLEL_MAKEINST = "-j1"
fakeroot do_install () {
oe_runmake 'BINDIR=${sbindir}' 'MANDIR=${mandir}/' 'DESTDIR=${D}' install
}
do_install_append() {
install -d ${D}${systemd_unitdir}/system
install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system
}
inherit systemd
SYSTEMD_SERVICE_${PN} = "arptables.service"