diff options
| -rw-r--r-- | package/maradns/Makefile | 65 | ||||
| -rwxr-xr-x | package/maradns/files/etc/init.d/S60maradns | 2 | ||||
| -rw-r--r-- | package/maradns/files/maradns.init | 2 | ||||
| -rw-r--r-- | package/maradns/files/mararc (renamed from package/maradns/files/etc/maradns/maradnsrc) | 0 | ||||
| -rw-r--r-- | package/maradns/ipkg/maradns.conffiles | 1 | ||||
| -rw-r--r-- | package/maradns/ipkg/maradns.control (renamed from package/maradns/maradns.control) | 0 |
6 files changed, 28 insertions, 42 deletions
diff --git a/package/maradns/Makefile b/package/maradns/Makefile index 7394630c69..8ef1d84cbc 100644 --- a/package/maradns/Makefile +++ b/package/maradns/Makefile @@ -12,21 +12,14 @@ 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 -IPKG_MARADNS:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -IDIR_MARADNS:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) -INFO_MARADNS:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list +include $(TOPDIR)/package/rules.mk -$(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) - -$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(PATCH) $(PKG_BUILD_DIR) ./patches - touch $(PKG_BUILD_DIR)/.prepared +$(eval $(call PKG_template,MARADNS,maradns,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared - (cd $(PKG_BUILD_DIR); rm -rf config.cache; \ + (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ @@ -46,42 +39,34 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --mandir=/usr/share/man \ --sbindir=/usr/sbin \ --sysconfdir=/etc \ - $(DISABLE_NLS) \ - $(DISABLE_LARGEFILE) \ + $(DISABLE_LARGEFILE) \ + $(DISABLE_NLS) \ + --enable-shared \ + --disable-static \ ); touch $(PKG_BUILD_DIR)/.configured -$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ CFLAGS="$(TARGET_CFLAGS)" \ FLAGS="$(TARGET_CFLAGS)" \ CC=$(TARGET_CC) \ HOSTCC="$(HOSTCC)" + mkdir -p $(PKG_INSTALL_DIR)/usr/{bin,sbin} + mkdir -p $(PKG_INSTALL_DIR)/usr/man/man{1,5,8} + $(MAKE) -C $(PKG_BUILD_DIR) \ + PREFIX="$(PKG_INSTALL_DIR)/usr" \ + install + touch $(PKG_BUILD_DIR)/.built -$(IPKG_MARADNS): $(PKG_BUILD_DIR)/$(PKG_NAME) - $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_MARADNS) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(IDIR_MARADNS)/usr/bin - mkdir -p $(IDIR_MARADNS)/usr/sbin - cp $(PKG_BUILD_DIR)/server/maradns $(IDIR_MARADNS)/usr/sbin/ - cp $(PKG_BUILD_DIR)/tuzona/getzone $(IDIR_MARADNS)/usr/bin/ - cp $(PKG_BUILD_DIR)/tuzona/zoneserver $(IDIR_MARADNS)/usr/sbin/ - cp $(PKG_BUILD_DIR)/tools/askmara $(IDIR_MARADNS)/usr/bin/ - $(STRIP) $(IDIR_MARADNS)/usr/sbin/* - $(STRIP) $(IDIR_MARADNS)/usr/bin/* - cp -a ./files/* $(IDIR_MARADNS)/ - find $(IDIR_MARADNS) -name CVS | xargs rm -rf - echo "/etc/maradns/maradnsrc" > $(IDIR_MARADNS)/CONTROL/conffiles - chmod 755 $(IDIR_MARADNS)/etc/init.d/* - mkdir -p $(PACKAGE_DIR) +$(IPKG_MARADNS): + install -d -m0755 $(IDIR_MARADNS)/etc + install -m0644 ./files/mararc $(IDIR_MARADNS)/etc/mararc + install -d -m0755 $(IDIR_MARADNS)/etc/init.d + install -m0755 ./files/maradns.init $(IDIR_MARADNS)/etc/init.d/S60maradns + install -d -m0755 $(IDIR_MARADNS)/usr/bin + cp -fpR $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone} $(IDIR_MARADNS)/usr/bin/ + install -d -m0755 $(IDIR_MARADNS)/usr/sbin + cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/{maradns,zoneserver} $(IDIR_MARADNS)/usr/sbin/ + $(RSTRIP) $(IDIR_MARADNS) $(IPKG_BUILD) $(IDIR_MARADNS) $(PACKAGE_DIR) - -$(INFO_MARADNS): $(IPKG_MARADNS) - $(IPKG) install $(IPKG_MARADNS) - -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.prepared -compile: $(IPKG_MARADNS) -install: $(INFO_MARADNS) - -clean: - rm -rf $(PKG_BUILD_DIR) $(IPKG_MARADNS) diff --git a/package/maradns/files/etc/init.d/S60maradns b/package/maradns/files/etc/init.d/S60maradns deleted file mode 100755 index a7a92a8ce5..0000000000 --- a/package/maradns/files/etc/init.d/S60maradns +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/sbin/maradns -f /etc/maradns/maradnsrc >/dev/null 2>&1 & diff --git a/package/maradns/files/maradns.init b/package/maradns/files/maradns.init new file mode 100644 index 0000000000..d469f9e560 --- /dev/null +++ b/package/maradns/files/maradns.init @@ -0,0 +1,2 @@ +#!/bin/sh +/usr/sbin/maradns >/dev/null 2>&1 & diff --git a/package/maradns/files/etc/maradns/maradnsrc b/package/maradns/files/mararc index ee91cbc1ef..ee91cbc1ef 100644 --- a/package/maradns/files/etc/maradns/maradnsrc +++ b/package/maradns/files/mararc diff --git a/package/maradns/ipkg/maradns.conffiles b/package/maradns/ipkg/maradns.conffiles new file mode 100644 index 0000000000..53fcab8e5f --- /dev/null +++ b/package/maradns/ipkg/maradns.conffiles @@ -0,0 +1 @@ +/etc/mararc
\ No newline at end of file diff --git a/package/maradns/maradns.control b/package/maradns/ipkg/maradns.control index b2175038d0..b2175038d0 100644 --- a/package/maradns/maradns.control +++ b/package/maradns/ipkg/maradns.control |