fix syslog-ng, remove libol dependency in ipkg/control since statically linked, change startup prio to a more reasonable value, standardize.
SVN-Revision: 3513
This commit is contained in:
parent
d7121237f9
commit
0af7cb2c68
2 changed files with 31 additions and 35 deletions
|
@ -14,15 +14,16 @@ PKG_CAT:=zcat
|
|||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
||||
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
|
||||
PKG_INIT_LEVEL:=00
|
||||
PKG_INIT_LEVEL:=60
|
||||
|
||||
include $(TOPDIR)/package/rules.mk
|
||||
|
||||
$(eval $(call PKG_template,SYSLOG_NG,syslog-ng,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
|
||||
|
||||
|
||||
$(PKG_BUILD_DIR)/.configured:
|
||||
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
CFLAGS="$(TARGET_CFLAGS)" \
|
||||
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/libol" \
|
||||
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libol" \
|
||||
./configure \
|
||||
|
@ -45,11 +46,10 @@ $(PKG_BUILD_DIR)/.configured:
|
|||
--sysconfdir=/etc \
|
||||
$(DISABLE_LARGEFILE) \
|
||||
$(DISABLE_NLS) \
|
||||
--localstatedir=/var/lib \
|
||||
--disable-dependency-tracking \
|
||||
--disable-full-static \
|
||||
--enable-tcp-wrapper \
|
||||
--with-libol=$(STAGING_DIR)/usr/bin \
|
||||
--with-libol="$(STAGING_DIR)/usr/bin" \
|
||||
);
|
||||
touch $(PKG_BUILD_DIR)/.configured
|
||||
|
||||
|
@ -58,19 +58,16 @@ $(PKG_BUILD_DIR)/.built:
|
|||
mkdir -p $(PKG_INSTALL_DIR)
|
||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/libol" \
|
||||
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libol" \
|
||||
CC=$(TARGET_CC) \
|
||||
install-exec install-data
|
||||
all install
|
||||
touch $@
|
||||
|
||||
$(IPKG_SYSLOG_NG):
|
||||
install -d -m0755 $(IDIR_SYSLOG_NG)/usr/sbin
|
||||
install -d -m0755 $(IDIR_SYSLOG_NG)/etc/syslog-ng
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/syslog-ng $(IDIR_SYSLOG_NG)/usr/sbin/
|
||||
install -d -m0755 $(IDIR_SYSLOG_NG)/etc/init.d
|
||||
$(CP) ${PKG_BUILD_DIR}/src/syslog-ng $(IDIR_SYSLOG_NG)/usr/sbin/
|
||||
$(CP) files/syslog-ng.conf $(IDIR_SYSLOG_NG)/etc/syslog-ng/
|
||||
$(CP) files/syslog-ng.init $(IDIR_SYSLOG_NG)/etc/init.d/S$(PKG_INIT_LEVEL)syslog-ng
|
||||
install -m0755 ./files/syslog-ng.init $(IDIR_SYSLOG_NG)/etc/init.d/S$(PKG_INIT_LEVEL)syslog-ng
|
||||
install -d -m0755 $(IDIR_SYSLOG_NG)/etc/syslog-ng
|
||||
install -m0644 ./files/syslog-ng.conf $(IDIR_SYSLOG_NG)/etc/syslog-ng/
|
||||
$(RSTRIP) $(IDIR_SYSLOG_NG)
|
||||
$(IPKG_BUILD) $(IDIR_SYSLOG_NG) $(PACKAGE_DIR)
|
||||
|
||||
|
|
|
@ -2,4 +2,3 @@ Package: syslog-ng
|
|||
Priority: optional
|
||||
Section: admin
|
||||
Description: A powerful syslog daemon
|
||||
Depends: libol
|
||||
|
|
Loading…
Reference in a new issue