Skip to contentSkip to conversation

aiccu: new package

PATCH New Michael Rommel 2 participants 2 messages Sep 13, 2013 – Sep 15, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 aiccu: new package

Automatic IPv6 Connectivity Configuration Utility for users of a IPv6 tunnel broker, developed by sixxs.net

---
Changes v4 -> v5
* changed the patch to remove the strip command completely tested cross compilation for i568 and powerpc

Changes v3 -> v4
* added a patch to use the host-strip command

Changes v2 -> v3
* changed the installation procedure to use the install directive for only the binary and the configuration file and a conditional SYSV directive for the correct init script

Changes v1 -> v2
* changed the installation procedure to use the standard install of the package
* added a patch for installing the correct init script

 package/Config.in                                  |    1 +
 package/aiccu/Config.in                            |   21 ++++
 .../aiccu/aiccu-0001-gnutls-and-uclibc-fixes.patch |  104 ++++++++++++++++++++
 .../aiccu/aiccu-0002-makefile-remove-strip.patch   |   20 ++++
 package/aiccu/aiccu.mk                             |   32 ++++++
 5 files changed, 178 insertions(+)
 create mode 100644 package/aiccu/Config.in
 create mode 100644 package/aiccu/aiccu-0001-gnutls-and-uclibc-fixes.patch
 create mode 100644 package/aiccu/aiccu-0002-makefile-remove-strip.patch
 create mode 100644 package/aiccu/aiccu.mk
package/Config.in +1 -0
index 64ca5ba..2884bfb 100644
@@ -743,6 +743,7 @@ source "package/sound-theme-freedesktop/Config.in"
 endmenu
 
 menu "Networking applications"
+source "package/aiccu/Config.in"
 source "package/aircrack-ng/Config.in"
 source "package/argus/Config.in"
 source "package/arptables/Config.in"
package/aiccu/Config.in new file +21 -0
new file mode 100644
index 0000000..1c6f554
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_AICCU
+	bool "aiccu"
+	depends on BR2_INET_IPV6
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_GNUTLS
+	help
+	  SixXS Automatic IPv6 Connectivity Client Utility
+
+	  AICCU (Automatic IPv6 Connectivity Client Utility) makes it
+	  easy for users to get IPv6 connectivity. After having
+	  requested an account, tunnel and optionally a subnet, AICCU
+	  can be used to automatically configure the tunnel. AICCU
+	  supports TIC (Tunnel Information & Control protocol), which it
+	  uses for retrieving the tunnel configuration information,
+	  AYIYA, which allows tunnels to be created even behind
+	  firewalls and NAT's.
+
+	  http://www.sixxs.net/tools/aiccu/
+
+comment "aiccu requires a toolchain with IPv6 and WCHAR support"
+	depends on !(BR2_INET_IPV6 && BR2_USE_WCHAR)
package/aiccu/aiccu-0001-gnutls-and-uclibc-fixes.patch new file +104 -0

104 lines not on this page · raw message

package/aiccu/aiccu-0002-makefile-remove-strip.patch new file +20 -0
new file mode 100644
index 0000000..de9c433
@@ -0,0 +1,20 @@
+Makefile: removed strip command, it would not cater for cross compiling
+	  and since buildroot strips the binaries anyway, it was suggested
+	  by Arnout to remove it completely.
+
+Signed-off-by: Michael Rommel <[email protected]>
+
+--- aiccu_20070115.orig/unix-console/Makefile	2007-01-15 12:04:27.000000000 +0100
++++ aiccu_20070115/unix-console/Makefile	2013-09-13 19:54:51.740933958 +0200
+@@ -145,11 +145,6 @@ all: aiccu
+ 
+ aiccu:	$(OBJS) ${SRCS} ${INCS}
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
+-ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0)
+-ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1)
+-	strip $@
+-endif
+-endif
+ 
+ clean:
+ 	$(RM) -f $(OBJS) aiccu
package/aiccu/aiccu.mk new file +32 -0
new file mode 100644
index 0000000..05f4ba0
@@ -0,0 +1,32 @@
+################################################################################
+#
+# aiccu
+#
+################################################################################
+
+AICCU_VERSION = 20070115
+AICCU_SOURCE = aiccu_$(AICCU_VERSION).tar.gz
+AICCU_SITE = http://www.sixxs.net/archive/sixxs/aiccu/unix/
+AICCU_LICENSE = SixXS License, concise redistribution license
+AICCU_LICENSE_FILES = doc/LICENSE
+AICCU_DEPENDENCIES = gnutls
+
+define AICCU_BUILD_CMDS
+	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) all
+endef
+
+define AICCU_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/unix-console/aiccu \
+		$(TARGET_DIR)/usr/sbin/aiccu
+	[ -f $(TARGET_DIR)/etc/aiccu.conf ] || \
+		$(INSTALL) -D -m 0644 $(@D)/doc/aiccu.conf \
+		$(TARGET_DIR)/etc/aiccu.conf
+endef
+
+define AICCU_INSTALL_INIT_SYSV
+	[ -f $(TARGET_DIR)/etc/init.d/S50aiccu ] || \
+		$(INSTALL) -D -m 0755 $(@D)/doc/aiccu.init \
+		$(TARGET_DIR)/etc/init.d/S50aiccu
+endef
+
+$(eval $(generic-package))
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v5 1/1 aiccu: new package

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

"Michael" == Michael Rommel <[email protected]> writes:

Michael> Automatic IPv6 Connectivity Configuration Utility for users of a Michael> IPv6 tunnel broker, developed by sixxs.net

Michael> Signed-off-by: Michael Rommel <[email protected]> Michael> ---
Michael> Changes v4 -> v5
Michael> * changed the patch to remove the strip command completely
Michael> tested cross compilation for i568 and powerpc

Michael> +++ b/package/aiccu/aiccu-0002-makefile-remove-strip.patch Michael> @@ -0,0 +1,20 @@
Michael> +Makefile: removed strip command, it would not cater for cross compiling
Michael> + and since buildroot strips the binaries anyway, it was suggested
Michael> + by Arnout to remove it completely.
Michael> +
Michael> +Signed-off-by: Michael Rommel <[email protected]> Michael> +
Michael> +--- aiccu_20070115.orig/unix-console/Makefile 2007-01-15 12:04:27.000000000 +0100
Michael> ++++ aiccu_20070115/unix-console/Makefile 2013-09-13 19:54:51.740933958 +0200
Michael> +@@ -145,11 +145,6 @@ all: aiccu
Michael> +
Michael> + aiccu: $(OBJS) ${SRCS} ${INCS}
Michael> + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
Michael> +-ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0) Michael> +-ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1)
Michael> +- strip $@
Michael> +-endif
Michael> +-endif

So we can just pass RPM_OPT_FLAGS to get it to not strip? That seems nicer.

Michael> +################################################################################ Michael> +#
Michael> +# aiccu
Michael> +#
Michael> +################################################################################ Michael> +
Michael> +AICCU_VERSION = 20070115
Michael> +AICCU_SOURCE = aiccu_$(AICCU_VERSION).tar.gz
Michael> +AICCU_SITE = http://www.sixxs.net/archive/sixxs/aiccu/unix/
Michael> +AICCU_LICENSE = SixXS License, concise redistribution license Michael> +AICCU_LICENSE_FILES = doc/LICENSE
Michael> +AICCU_DEPENDENCIES = gnutls
Michael> +
Michael> +define AICCU_BUILD_CMDS
Michael> + $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) all

We also need to pass our CFLAGS / LDFLAGS. Looking at the Makefile's we can just pass them in the environment if we directly call the sub Makefile in unix-console. LD doesn't seem to be used anywhere, so we can drop it.

E.G. we end up with something like:

	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" \
		RPM_OPT_FLAGS=1 -C $(@D)/unix-console all

Committed with these changes, thanks.

Signature · 1 line
Bye, Peter Korsgaard