summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/alsa-utils/Makefile2
-rw-r--r--package/base-files/Makefile3
-rw-r--r--package/cairo/Makefile1
-rw-r--r--package/cifs-utils/Makefile6
-rw-r--r--package/collectd/Makefile39
-rw-r--r--package/collectd/patches/patch-src_Makefile_in13
-rw-r--r--package/libgcc/Makefile6
-rw-r--r--package/libpthread/Makefile2
-rw-r--r--package/mpd/Makefile2
-rw-r--r--package/mpd/files/mpd.conf4
-rw-r--r--package/rrdtool/Makefile35
-rw-r--r--package/rrdtool/patches/patch-configure21
-rw-r--r--package/rrdtool/patches/patch-ltmain_sh11
13 files changed, 67 insertions, 78 deletions
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 8f9f1b3d6..0d6881c48 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= b65e9a04181bd7c9db7667a4566f8dc3
PKG_DESCR:= ALSA mixer utility
PKG_SECTION:= multimedia
-PKG_DEPENDS:= alsa-lib libpthread
+PKG_DEPENDS:= alsa-lib libpthread libgcc
PKG_BUILDDEP:= alsa-lib
PKG_URL:= http://www.alsa-project.org/
PKG_SITES:= ftp://ftp.alsa-project.org/pub/utils/
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 605922737..8ff743270 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -65,6 +65,9 @@ endif
ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y)
$(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab
endif
+ifeq ($(ADK_TARGET_SYSTEM_ARANYM),y)
+ $(SED) 's#ttyS#nfcon0#g' $(IDIR_BASE_FILES)/etc/inittab
+endif
$(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab
test -z $(ADK_RUNTIME_HOSTNAME) || \
echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 93453d917..887a60425 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -10,6 +10,7 @@ PKG_MD5SUM:= f101a9e88b783337b20b2e26dfd26d5f
PKG_DESCR:= cairo graphics library
PKG_SECTION:= libs
PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman
+PKG_DEPENDS+= libxrender
PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 libXrender glib
PKG_BUILDDEP+= libXext
PKG_URL:= http://cairographics.org/
diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile
index 4b718b07d..e12c6caf7 100644
--- a/package/cifs-utils/Makefile
+++ b/package/cifs-utils/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= cifs-utils
-PKG_VERSION:= 6.0
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 371e007a201be90c16497cd9bd5e2553
+PKG_VERSION:= 6.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= f83ef48ab1154aa74dd4cf1c1202bf04
PKG_DESCR:= CIFS utilities
PKG_SECTION:= net/fs
PKG_DEPENDS:= kmod-cifs
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 942e88942..af8ffaf3d 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -4,16 +4,21 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= collectd
-PKG_VERSION:= 5.0.1
+PKG_VERSION:= 5.4.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= a405d6cca021748fea43b60348b72b0c
+PKG_MD5SUM:= d4176b3066f3b85d85343d3648ea43f6
PKG_DESCR:= System statistics collection daemon
PKG_SECTION:= misc
-PKG_DEPENDS:= libpthread
+PKG_BUILDDEP:= libtool
+PKG_DEPENDS:= libpthread libltdl
PKG_URL:= http://collectd.org/
PKG_SITES:= http://collectd.org/files/
PKG_FLAVOURS_COLLECTD:= WITH_CPU WITH_LOAD WITH_MEMORY WITH_PING
+PKG_FLAVOURS_COLLECTD+= WITH_RRD
+PKGFD_WITH_RRD:= enable RRD output
+PKGFB_WITH_RRD:= rrdtool
+PKGFS_WITH_RRD:= librrd
PKGFD_WITH_CPU:= collect CPU statistics
PKGFD_WITH_LOAD:= collect system load statistics
PKGFD_WITH_MEMORY:= collect memory usage statistics
@@ -36,11 +41,14 @@ ifneq (${ADK_PACKAGE_COLLECTD_WITH_PING},y)
DISABLE_PING:=--disable-ping
endif
-CONFIGURE_ARGS+= --disable-apache \
+CONFIGURE_ARGS+= --disable-aggregation \
+ --disable-apache \
--disable-apcups \
--disable-apple_sensors \
--disable-ascent \
--disable-battery \
+ --disable-cgroups \
+ --disable-conntrack \
${DISABLE_CPU} \
--disable-cpufreq \
--disable-contextswitch \
@@ -50,6 +58,7 @@ CONFIGURE_ARGS+= --disable-apache \
--disable-dns \
--disable-email \
--disable-entropy \
+ --disable-ethstat \
--disable-exec \
--disable-filecount \
--disable-fscache \
@@ -61,38 +70,47 @@ CONFIGURE_ARGS+= --disable-apache \
${DISABLE_LOAD} \
--disable-madwifi \
--disable-mbmon \
+ --disable-md \
--disable-memcached \
${DISABLE_MEMORY} \
--disable-multimeter \
--disable-mysql \
- --disable-openvpn \
- --disable-python \
- --disable-postgresql \
- --disable-powerdns \
--disable-network \
--disable-nginx \
--disable-nfs \
--disable-ntpd \
+ --disable-numa \
--disable-nut \
+ --disable-olsrd \
+ --disable-openvpn \
+ --disable-python \
+ --disable-postgresql \
+ --disable-powerdns \
--disable-perl \
${DISABLE_PING} \
--disable-processes \
+ --disable-protocols \
--disable-sensors \
--disable-serial \
--disable-logfile \
+ --disable-statsd \
--disable-swap \
- --disable-syslog \
+ --enable-syslog \
--disable-tape \
--disable-target_notification \
--disable-target_replace \
--disable-target_set \
+ --disable-tcpconns \
--disable-teamspeak2 \
--disable-ted \
--disable-thermal \
--disable-unixsock \
--disable-users \
+ --disable-uptime \
+ --disable-uuid \
--disable-vserver \
--disable-wireless \
+ --disable-write_graphite \
--disable-write_http \
--with-fp-layout=nothing \
--without-java \
@@ -106,6 +124,9 @@ XAKE_FLAGS+= LIBS='-lm -lltdl'
post-install:
${INSTALL_DIR} ${IDIR_COLLECTD}/usr/lib/collectd \
${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/etc
+ ${INSTALL_DIR} ${IDIR_COLLECTD}/usr/share/collectd
+ ${CP} ${WRKINST}/usr/share/collectd/types.db \
+ ${IDIR_COLLECTD}/usr/share/collectd
${INSTALL_BIN} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin
${CP} ${WRKINST}/usr/lib/collectd/*.so \
${IDIR_COLLECTD}/usr/lib/collectd
diff --git a/package/collectd/patches/patch-src_Makefile_in b/package/collectd/patches/patch-src_Makefile_in
deleted file mode 100644
index d1580516a..000000000
--- a/package/collectd/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
---- collectd-5.0.1.orig/src/Makefile.in 2011-10-14 22:54:14.000000000 +0200
-+++ collectd-5.0.1/src/Makefile.in 2011-10-22 18:57:51.000000000 +0200
-@@ -56,8 +56,8 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT)
- # too. -octo
- @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_13 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
- @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_14 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
--@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = $(LIBLTDL) liboconfig/liboconfig.la
--@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = $(LIBLTDL) liboconfig/liboconfig.la
-+@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = liboconfig/liboconfig.la
-+@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = liboconfig/liboconfig.la
- @BUILD_WITH_OWN_LIBOCONFIG_FALSE@am__append_17 = -loconfig
- @BUILD_WITH_LIBSOCKET_TRUE@am__append_18 = -lsocket
- @BUILD_AIX_TRUE@am__append_19 = -lm
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 003cd9783..9c024504c 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -11,7 +11,7 @@ PKG_SECTION:= libs
NO_DISTFILES:= 1
-PKG_ARCH_DEPENDS:= !sh !avr32
+PKG_ARCH_DEPENDS:= !avr32
include ${TOPDIR}/mk/package.mk
@@ -24,8 +24,12 @@ INSTALL_STYLE:= manual
do-install:
ifeq ($(ADK_NATIVE),)
${INSTALL_DIR} ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+ifeq ($(ADK_LINUX_SH),y)
+ ${CP} ${STAGING_TARGET_DIR}/lib/!m1/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+else
${CP} ${STAGING_TARGET_DIR}/$(ADK_TARGET_LIBC_PATH)/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
endif
+endif
ifeq ($(ADK_TARGET_MULTILIB_X86_32),y)
${INSTALL_DIR} ${IDIR_LIBGCC}/lib32
${CP} ${STAGING_TARGET_DIR_32}/lib/libgcc*.so* ${IDIR_LIBGCC}/lib32
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index cf395108d..cdc2fe9bb 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -43,8 +43,8 @@ INSTALL_STYLE:= manual
libpthread-install:
ifeq ($(ADK_NATIVE),)
- ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
ifeq ($(ADK_TARGET_LIB_MUSL),)
+ ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
endif
endif
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 39cf4b0c8..d8ad8eac5 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 2
PKG_MD5SUM:= b68be330deeb23989c08a9fefd9fcdeb
PKG_DESCR:= A music player daemon
PKG_SECTION:= multimedia
-PKG_DEPENDS:= glib libstdcxx
+PKG_DEPENDS:= glib libstdcxx libgcc
PKG_FDEPENDS:= glib libstdcxx
PKG_BUILDDEP:= glib
PKG_URL:= http://www.musicpd.org/
diff --git a/package/mpd/files/mpd.conf b/package/mpd/files/mpd.conf
index 48af33c4a..d05c29e44 100644
--- a/package/mpd/files/mpd.conf
+++ b/package/mpd/files/mpd.conf
@@ -1,8 +1,8 @@
# An example configuration file for MPD
user "mpd"
music_directory "/music"
-playlist_directory "~/playlists"
-db_file "~/.database"
+playlist_directory "/etc/mpd/playlists"
+db_file "/etc/mpd/database"
pid_file "/var/run/mpd/mpd.pid"
log_file "syslog"
# An example of an ALSA output
diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile
index a047f032c..840633559 100644
--- a/package/rrdtool/Makefile
+++ b/package/rrdtool/Makefile
@@ -4,25 +4,29 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= rrdtool
-PKG_VERSION:= 1.2.30
+PKG_VERSION:= 1.4.8
PKG_RELEASE:= 1
-PKG_MD5SUM:= 19b24f7184a8dbf7b48c1bbb565ad9fb
-PKG_DESCR:= Round Robin Database (RRD) management library and tools
+PKG_MD5SUM:= dbe59386db97fd2f2216729facd74ca8
+PKG_DESCR:= Round Robin Database (RRD) management library
PKG_SECTION:= libs
PKG_DEPENDS:= libart libfreetype libpng zlib
+PKG_DEPENDS+= glib cairo pango
PKG_BUILDDEP:= libxml2 cgilib freetype libart libpng
+PKG_BUILDDEP+= glib cairo pango
PKG_URL:= http://oss.oetiker.ch/
PKG_SITES:= http://oss.oetiker.ch/rrdtool/pub/
PKG_SUBPKGS:= LIBRRD RRDCGI RRDTOOL
-PKG_SECTION_RRDCGI:= misc
-PKG_SECTION_RRDTOOL:= misc
+PKGSC_RRDCGI:= misc
+PKGSD_RRDCGI:= RRD CGI
+PKGSC_RRDTOOL:= misc
+PKGSD_RRDTOOL:= RRD tool
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBRRD,librrd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_RRDCGI}))
-$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_RRDTOOL}))
+$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_RRDCGI}))
+$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_RRDTOOL}))
CONFIGURE_ENV+= rd_cv_ieee_works=yes
CONFIGURE_ARGS+= --enable-rrdcgi \
@@ -30,21 +34,22 @@ CONFIGURE_ARGS+= --enable-rrdcgi \
--disable-perl \
--disable-ruby \
--disable-tcl \
- --disable-python \
- --without-x \
- --with-rrd-default-font=/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
+ --disable-python
TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/freetype2
+TARGET_LDFLAGS+= -lglib-2.0
+XAKE_FLAGS+= GCC_HONOUR_COPTS=s
-post-install:
+rrdtool-install:
${INSTALL_DIR} ${IDIR_RRDTOOL}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/rrdtool ${WRKINST}/usr/bin/rrdupdate \
${IDIR_RRDTOOL}/usr/bin/
+
+rrdcgi-install:
${INSTALL_DIR} ${IDIR_RRDCGI}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/rrdcgi ${IDIR_RRDCGI}/usr/bin/
+
+librrd-install:
${INSTALL_DIR} ${IDIR_LIBRRD}/usr/lib
- ${CP} ${WRKINST}/usr/lib/librrd.so.* ${IDIR_LIBRRD}/usr/lib/
- ${INSTALL_DIR} ${IDIR_LIBRRD}/usr/share/rrdtool/fonts
- ${CP} ${WRKBUILD}/src/DejaVuSansMono-Roman.ttf \
- ${IDIR_LIBRRD}/usr/share/rrdtool/fonts/
+ ${CP} ${WRKINST}/usr/lib/librrd*.so* ${IDIR_LIBRRD}/usr/lib/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rrdtool/patches/patch-configure b/package/rrdtool/patches/patch-configure
deleted file mode 100644
index 852d96098..000000000
--- a/package/rrdtool/patches/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- rrdtool-1.2.30.orig/configure 2009-01-19 15:29:29.000000000 +0100
-+++ rrdtool-1.2.30/configure 2009-05-09 04:31:25.000000000 +0200
-@@ -26320,7 +26320,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ex_check_save_CPPFLAGS=${CPPFLAGS}
- ex_check_save_LDFLAGS=${LDFLAGS}
- if test "x/usr/include/libart-2.0" != "x"; then
-- CPPFLAGS="$CPPFLAGS -I/usr/include/libart-2.0"
-+ CPPFLAGS="$CPPFLAGS"
- fi
- { echo "$as_me:$LINENO: checking for art_vpath_add_point in -lart_lgpl_2" >&5
- echo $ECHO_N "checking for art_vpath_add_point in -lart_lgpl_2... $ECHO_C" >&6; }
-@@ -27916,7 +27916,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ex_check_save_CPPFLAGS=${CPPFLAGS}
- ex_check_save_LDFLAGS=${LDFLAGS}
- if test "x/usr/include/freetype2" != "x"; then
-- CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
-+ CPPFLAGS="$CPPFLAGS"
- fi
- { echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5
- echo $ECHO_N "checking for FT_Init_FreeType in -lfreetype... $ECHO_C" >&6; }
diff --git a/package/rrdtool/patches/patch-ltmain_sh b/package/rrdtool/patches/patch-ltmain_sh
deleted file mode 100644
index 940e4a403..000000000
--- a/package/rrdtool/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- rrdtool-1.2.30.orig/ltmain.sh 2007-03-14 16:47:55.000000000 +0100
-+++ rrdtool-1.2.30/ltmain.sh 2011-01-16 22:22:28.000000000 +0100
-@@ -1623,7 +1623,7 @@ EOF
- # -pg pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-- -t[45]*|-txscale*|@*)
-+ -t[45]*|-txscale*|@*|-fstack-protector*|-flto)
-
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-02 12:23:08 +0000