fix ar7 image builder

[openwrt.git] / openwrt / package / ulogd / Makefile

diff --git a/openwrt/package/ulogd/Makefile b/openwrt/package/ulogd/Makefile
index b3ce9c3..893fd5b 100644 (file)
--- a/openwrt/package/ulogd/Makefile
+++ b/openwrt/package/ulogd/Makefile
@@ -4,21 +4,24 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ulogd
 PKG_VERSION:=1.23
 
 PKG_NAME:=ulogd
 PKG_VERSION:=1.23

-PKG_RELEASE:=1
+PKG_RELEASE:=2.1

 PKG_MD5SUM:=fa3dfcaacf31855626d5b731b04a077f
 
 PKG_MD5SUM:=fa3dfcaacf31855626d5b731b04a077f
 

-PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/
+PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/ \
+       ftp://ftp.be.netfilter.org/pub/netfilter/ulogd/ \
+       ftp://ftp.de.netfilter.org/pub/netfilter/ulogd/ \
+       ftp://ftp.no.netfilter.org/pub/netfilter/ulogd/

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 

-ifneq ($(BR2_PACKAGE_ULOGD_MYSQL_PLUGIN),)
+ifneq ($(BR2_PACKAGE_ULOGD_MOD_MYSQL),)

 ULOGD_MYSQL_OPTION:=--with-mysql=$(STAGING_DIR)/usr
 endif
 
 ULOGD_MYSQL_OPTION:=--with-mysql=$(STAGING_DIR)/usr
 endif
 

-ifneq ($(BR2_PACKAGE_ULOGD_PGSQL_PLUGIN),)
+ifneq ($(BR2_PACKAGE_ULOGD_MOD_PGSQL),)

 ULOGD_PGSQL_OPTION:=--with-pgsql=$(STAGING_DIR)/usr
 endif
 
 ULOGD_PGSQL_OPTION:=--with-pgsql=$(STAGING_DIR)/usr
 endif
 


@@ -26,7 +29,9 @@ define IPKG_plugin_template
 
 $$(IPKG_$(1)):
        install -m0755 -d $$(IDIR_$(1))/usr/lib/ulogd
 
 $$(IPKG_$(1)):
        install -m0755 -d $$(IDIR_$(1))/usr/lib/ulogd

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_$(2).so $$(IDIR_$(1))/usr/lib/ulogd/
+       for m in $(2); do \
+               $(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_$$$${m}.so $$(IDIR_$(1))/usr/lib/ulogd/ ; \
+       done

        $(RSTRIP) $$(IDIR_$(1))
        $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
 
        $(RSTRIP) $$(IDIR_$(1))
        $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
 


@@ -35,43 +40,45 @@ endef
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,ULOGD,ulogd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,ULOGD,ulogd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))

-$(eval $(call PKG_template,ULOGD_MYSQL_PLUGIN,ulogd-mod-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ULOGD_PGSQL_PLUGIN,ulogd-mod-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,ULOGD_MOD_MYSQL,ulogd-mod-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))

 
 

-$(eval $(call IPKG_plugin_template,ULOGD_MYSQL_PLUGIN,MYSQL))
-$(eval $(call IPKG_plugin_template,ULOGD_PGSQL_PLUGIN,PGSQL))
+$(eval $(call IPKG_plugin_template,ULOGD_MOD_MYSQL,MYSQL))
+$(eval $(call IPKG_plugin_template,ULOGD_MOD_PGSQL,PGSQL))
+$(eval $(call IPKG_plugin_template,ULOGD_MOD_EXTRA,LOCAL LOGEMU OPRINT PWSNIFF SYSLOG))

 
 $(PKG_BUILD_DIR)/.configured:
 
 $(PKG_BUILD_DIR)/.configured:

-       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \

                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \

-               CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \

                ac_cv_header_pcap_h=no \
                ./configure \
                ac_cv_header_pcap_h=no \
                ./configure \

-                 --target=$(GNU_TARGET_NAME) \
-                 --host=$(GNU_TARGET_NAME) \
-                 --build=$(GNU_HOST_NAME) \
-                 --program-prefix="" \
-                 --program-suffix="" \
-                 --prefix=/usr \
-                 --exec-prefix=/usr \
-                 --bindir=/usr/bin \
-                 --datadir=/usr/share \
-                 --includedir=/usr/include \
-                 --infodir=/usr/share/info \
-                 --libdir=/usr/lib \
-                 --libexecdir=/usr/lib \
-                 --localstatedir=/var \
-                 --mandir=/usr/share/man \
-                 --sbindir=/usr/sbin \
-                 --sysconfdir=/etc \
-                 $(DISABLE_LARGEFILE) \
-                 $(DISABLE_NLS) \
-                 --enable-shared \
-                 --disable-static \
-                 $(ULOGD_MYSQL_OPTION) \
-                 $(ULOGD_PGSQL_OPTION) \
+                       --target=$(GNU_TARGET_NAME) \
+                       --host=$(GNU_TARGET_NAME) \
+                       --build=$(GNU_HOST_NAME) \
+                       --program-prefix="" \
+                       --program-suffix="" \
+                       --prefix=/usr \
+                       --exec-prefix=/usr \
+                       --bindir=/usr/bin \
+                       --datadir=/usr/share \
+                       --includedir=/usr/include \
+                       --infodir=/usr/share/info \
+                       --libdir=/usr/lib \
+                       --libexecdir=/usr/lib \
+                       --localstatedir=/var \
+                       --mandir=/usr/share/man \
+                       --sbindir=/usr/sbin \
+                       --sysconfdir=/etc \
+                       $(DISABLE_LARGEFILE) \
+                       $(DISABLE_NLS) \
+                       --enable-shared \
+                       --disable-static \
+                       $(ULOGD_MYSQL_OPTION) \
+                       $(ULOGD_PGSQL_OPTION) \

        );
        touch $@
 
        );
        touch $@
 


@@ -85,12 +92,15 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_ULOGD):
        install -d -m0755 $(IDIR_ULOGD)/etc
 
 $(IPKG_ULOGD):
        install -d -m0755 $(IDIR_ULOGD)/etc

-       cp -fpR $(PKG_INSTALL_DIR)/etc/ulogd.conf $(IDIR_ULOGD)/etc/
+       $(CP) $(PKG_INSTALL_DIR)/etc/ulogd.conf $(IDIR_ULOGD)/etc/

        install -d -m0755 $(IDIR_ULOGD)/etc/default
        install -m0644 ./files/ulogd.default $(IDIR_ULOGD)/etc/default/ulogd
        install -d -m0755 $(IDIR_ULOGD)/etc/init.d
        install -m0755 ./files/ulogd.init $(IDIR_ULOGD)/etc/init.d/ulogd
        install -d -m0755 $(IDIR_ULOGD)/etc/default
        install -m0644 ./files/ulogd.default $(IDIR_ULOGD)/etc/default/ulogd
        install -d -m0755 $(IDIR_ULOGD)/etc/init.d
        install -m0755 ./files/ulogd.init $(IDIR_ULOGD)/etc/init.d/ulogd

+       ln -sf ulogd $(IDIR_ULOGD)/etc/init.d/S49ulogd
+       install -d -m0755 $(IDIR_ULOGD)/usr/lib/ulogd
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_BASE.so $(IDIR_ULOGD)/usr/lib/ulogd/

        install -d -m0755 $(IDIR_ULOGD)/usr/sbin
        install -d -m0755 $(IDIR_ULOGD)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(IDIR_ULOGD)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(IDIR_ULOGD)/usr/sbin/

        $(RSTRIP) $(IDIR_ULOGD)
        $(IPKG_BUILD) $(IDIR_ULOGD) $(PACKAGE_DIR)
        $(RSTRIP) $(IDIR_ULOGD)
        $(IPKG_BUILD) $(IDIR_ULOGD) $(PACKAGE_DIR)