EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix syslog-ng, remove libol dependency in ipkg/control since statically linked, change startup prio to a more reasonable value, standardize.

Browse Source 
SVN-Revision: 3513
This commit is contained in:
Nicolas Thill 2006-03-27 21:58:04 +00:00
parent d7121237f9
commit 0af7cb2c68
2 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
openwrt/package/syslog-ng/Makefile
View File

@ -14,42 +14,42 @@ PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
PKG_INIT_LEVEL:=00 PKG_INIT_LEVEL:=60
include $(TOPDIR)/package/rules.mk include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,SYSLOG_NG,syslog-ng,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,SYSLOG_NG,syslog-ng,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(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)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/libol" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/libol" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libol" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libol" \
./configure \ ./configure \
--target=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \ --build=$(GNU_HOST_NAME) \
--program-prefix="" \ --program-prefix="" \
--program-suffix="" \ --program-suffix="" \
--prefix=/usr \ --prefix=/usr \
--exec-prefix=/usr \ --exec-prefix=/usr \
--bindir=/usr/bin \ --bindir=/usr/bin \
--datadir=/usr/share \ --datadir=/usr/share \
--includedir=/usr/include \ --includedir=/usr/include \
--infodir=/usr/share/info \ --infodir=/usr/share/info \
--libdir=/usr/lib \ --libdir=/usr/lib \
--libexecdir=/usr/lib \ --libexecdir=/usr/lib \
--localstatedir=/var \ --localstatedir=/var \
--mandir=/usr/share/man \ --mandir=/usr/share/man \
--sbindir=/usr/sbin \ --sbindir=/usr/sbin \
--sysconfdir=/etc \ --sysconfdir=/etc \
$(DISABLE_LARGEFILE) \ $(DISABLE_LARGEFILE) \
$(DISABLE_NLS) \ $(DISABLE_NLS) \
--localstatedir=/var/lib \ --disable-dependency-tracking \
--disable-dependency-tracking \ --disable-full-static \
--disable-full-static \ --enable-tcp-wrapper \
--enable-tcp-wrapper \ --with-libol="$(STAGING_DIR)/usr/bin" \
--with-libol=$(STAGING_DIR)/usr/bin \
); );
touch $(PKG_BUILD_DIR)/.configured touch $(PKG_BUILD_DIR)/.configured
@ -58,19 +58,16 @@ $(PKG_BUILD_DIR)/.built:
mkdir -p $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/libol" \ all install
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libol" \
CC=$(TARGET_CC) \
install-exec install-data
touch $@ touch $@
$(IPKG_SYSLOG_NG): $(IPKG_SYSLOG_NG):
install -d -m0755 $(IDIR_SYSLOG_NG)/usr/sbin 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 install -d -m0755 $(IDIR_SYSLOG_NG)/etc/init.d
$(CP) ${PKG_BUILD_DIR}/src/syslog-ng $(IDIR_SYSLOG_NG)/usr/sbin/ install -m0755 ./files/syslog-ng.init $(IDIR_SYSLOG_NG)/etc/init.d/S$(PKG_INIT_LEVEL)syslog-ng
$(CP) files/syslog-ng.conf $(IDIR_SYSLOG_NG)/etc/syslog-ng/ install -d -m0755 $(IDIR_SYSLOG_NG)/etc/syslog-ng
$(CP) files/syslog-ng.init $(IDIR_SYSLOG_NG)/etc/init.d/S$(PKG_INIT_LEVEL)syslog-ng install -m0644 ./files/syslog-ng.conf $(IDIR_SYSLOG_NG)/etc/syslog-ng/
$(RSTRIP) $(IDIR_SYSLOG_NG) $(RSTRIP) $(IDIR_SYSLOG_NG)
$(IPKG_BUILD) $(IDIR_SYSLOG_NG) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_SYSLOG_NG) $(PACKAGE_DIR)

1
openwrt/package/syslog-ng/ipkg/syslog-ng.control
View File

@ -2,4 +2,3 @@ Package: syslog-ng
Priority: optional Priority: optional
Section: admin Section: admin
Description: A powerful syslog daemon Description: A powerful syslog daemon
Depends: libol