From 6d26b19269a28ff576e872473cb3b4610a61fceb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 11 Oct 2009 19:36:32 +0200 Subject: make more apps statically linkable - update libusb to latest upstream - update bluez to latest upstream - add a new PKG_OPTS option: libonly, useful for library only packages, which are not created, when static linking is choosen --- package/dbus/Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'package/dbus') diff --git a/package/dbus/Makefile b/package/dbus/Makefile index a099da821..46739bfa2 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -12,10 +12,13 @@ PKG_SECTION:= net PKG_DEPENDS:= libexpat PKG_URL:= http://dbus.freedesktop.org PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ +ifeq ($(ADK_STATIC),y) +PKG_OPTS:= libonly +endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DBUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,DBUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-tests \ @@ -31,13 +34,15 @@ CONFIGURE_ENV+= ac_cv_have_abstract_sockets=no BUILD_STYLE:= auto INSTALL_STYLE:= auto +pre-install: + ${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus + $(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \ + $(STAGING_DIR)/usr/include/dbus-1.0/dbus/ + post-install: ${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib ${IDIR_DBUS}/usr/bin - ${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus ${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc/ ${CP} ${WRKINST}/usr/lib/libdbus-1.so.* ${IDIR_DBUS}/usr/lib/ - $(CP) $(WRKINST)/usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h \ - $(STAGING_DIR)/usr/include/dbus-1.0/dbus/ ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin/ ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin/ -- cgit v1.2.3 From eb10ac0e97c1e5e98ce73a1966c97a7cedb9d086 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 1 Dec 2009 19:40:13 +0100 Subject: use pkill for startup scripts - seems to solve the issue, that the same init script get killed otherwise - fine tune dansguardian, squid and iptables package - add default firewall config file (from freewrt) - add an example for transparent proxy via an ethernet bridge --- package/dbus/files/dbus.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/dbus') diff --git a/package/dbus/files/dbus.init b/package/dbus/files/dbus.init index 3484c4522..0f7367f38 100644 --- a/package/dbus/files/dbus.init +++ b/package/dbus/files/dbus.init @@ -14,7 +14,7 @@ start) dbus-daemon --config-file=/etc/dbus-1/system.conf ;; stop) - killall dbus-daemon + pkill dbus-daemon ;; restart) sh $0 stop -- cgit v1.2.3 From 1c8d49e1ee453e44af6c57f10e8b929d5ccdd3a2 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 19 Dec 2009 22:53:46 +0059 Subject: create package/Depends.mk dynamically; add PKG_BUILDDEP to all Makefiles Signed-off-by: Thorsten Glaser --- package/dbus/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/dbus') diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 46739bfa2..6bb63c302 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dbus PKG_VERSION:= 1.2.16 PKG_RELEASE:= 1 +PKG_BUILDDEP+= expat PKG_MD5SUM:= c7a47b851ebe02f6726b65b78d1b730b PKG_DESCR:= DBUS library PKG_SECTION:= net -- cgit v1.2.3 From 67fc90c4cc712a8610f2091e6d0984d8174061e1 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 19 Dec 2009 23:26:58 +0059 Subject: fix dependencies; note libfuse are broken MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • xx is the script used to validate them (will be folded into pkgmaker soon) • davfs2 (two of three flavours) and wdfs (once), as well as fuse (or fuse-utils?) depend on libfuse, but there is no libfuse (the working builddep on the fuse directory was kept intact, though) Signed-off-by: Thorsten Glaser --- package/dbus/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/dbus') diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 6bb63c302..32c90dbeb 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -10,7 +10,7 @@ PKG_BUILDDEP+= expat PKG_MD5SUM:= c7a47b851ebe02f6726b65b78d1b730b PKG_DESCR:= DBUS library PKG_SECTION:= net -PKG_DEPENDS:= libexpat +PKG_DEPENDS:= expat PKG_URL:= http://dbus.freedesktop.org PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ ifeq ($(ADK_STATIC),y) -- cgit v1.2.3 From 4c3ae4886697e712237ecfad2e0eb86b1f8a2b5f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 20 Dec 2009 13:17:47 +0100 Subject: reflect expat package renaming --- package/dbus/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/dbus') diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 32c90dbeb..6bb63c302 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -10,7 +10,7 @@ PKG_BUILDDEP+= expat PKG_MD5SUM:= c7a47b851ebe02f6726b65b78d1b730b PKG_DESCR:= DBUS library PKG_SECTION:= net -PKG_DEPENDS:= expat +PKG_DEPENDS:= libexpat PKG_URL:= http://dbus.freedesktop.org PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ ifeq ($(ADK_STATIC),y) -- cgit v1.2.3 From ce621815fecece2b4d8a4cb7115eb82c1cb7ed44 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Dec 2009 11:37:42 +0100 Subject: remove and ignore autogenerated Config.in files --- package/dbus/Config.in | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 package/dbus/Config.in (limited to 'package/dbus') diff --git a/package/dbus/Config.in b/package/dbus/Config.in deleted file mode 100644 index 8e8ca33fc..000000000 --- a/package/dbus/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config ADK_PACKAGE_DBUS - prompt "dbus.............................. DBUS library" - tristate - default n - select ADK_PACKAGE_LIBEXPAT - help - DBUS library. - - http://www.freedesktop.org/wiki/Software/dbus - -- cgit v1.2.3 From fc4027a2b4f5a9384e8552b8dd515e53aae9444c Mon Sep 17 00:00:00 2001 From: waldemar brodkorb Date: Tue, 19 Jan 2010 21:13:44 +0100 Subject: fix allmodconfig for foxboard --- package/dbus/Makefile | 2 +- package/dbus/patches/patch-configure | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 package/dbus/patches/patch-configure (limited to 'package/dbus') diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 6bb63c302..4dcb4067b 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dbus PKG_VERSION:= 1.2.16 PKG_RELEASE:= 1 -PKG_BUILDDEP+= expat PKG_MD5SUM:= c7a47b851ebe02f6726b65b78d1b730b PKG_DESCR:= DBUS library PKG_SECTION:= net PKG_DEPENDS:= libexpat +PKG_BUILDDEP+= expat PKG_URL:= http://dbus.freedesktop.org PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ ifeq ($(ADK_STATIC),y) diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure new file mode 100644 index 000000000..f33a192a9 --- /dev/null +++ b/package/dbus/patches/patch-configure @@ -0,0 +1,22 @@ +--- dbus-1.2.16.orig/configure 2009-07-14 21:43:08.000000000 +0200 ++++ dbus-1.2.16/configure 2010-01-15 19:03:24.000000000 +0100 +@@ -25213,19 +25213,6 @@ if test "x$GCC" = "xyes"; then + ;; + esac + +- case " $CFLAGS " in +- *[\ \ ]-fPIE[\ \ ]*) ;; +- *) if cc_supports_flag -fPIE; then +- PIE_CFLAGS="-fPIE" +- if ld_supports_flag -z,relro; then +- PIE_LDFLAGS="-pie -Wl,-z,relro" +- else +- PIE_LDFLAGS="-pie" +- fi +- fi +- ;; +- esac +- + ### Disabled warnings, and compiler flag overrides + + # Let's just ignore unused for now -- cgit v1.2.3 From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/dbus/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'package/dbus') diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 4dcb4067b..0e40fe548 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -13,6 +13,7 @@ PKG_DEPENDS:= libexpat PKG_BUILDDEP+= expat PKG_URL:= http://dbus.freedesktop.org PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif @@ -21,7 +22,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DBUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-tests \ --disable-abstract-sockets \ --without-x \ @@ -32,8 +32,6 @@ CONFIGURE_ARGS+= --disable-tests \ --disable-xml-docs \ --disable-doxygen-docs CONFIGURE_ENV+= ac_cv_have_abstract_sockets=no -BUILD_STYLE:= auto -INSTALL_STYLE:= auto pre-install: ${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus @@ -41,7 +39,8 @@ pre-install: $(STAGING_DIR)/usr/include/dbus-1.0/dbus/ post-install: - ${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib ${IDIR_DBUS}/usr/bin + ${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib \ + ${IDIR_DBUS}/usr/bin ${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc/ ${CP} ${WRKINST}/usr/lib/libdbus-1.so.* ${IDIR_DBUS}/usr/lib/ ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin/ -- cgit v1.2.3