diff options
80 files changed, 166 insertions, 28476 deletions
@@ -1,12 +1,8 @@ -- automatically add -dbg package via objcopy magic - evaluate libguestfs for image creation -- add PKG_AUTOTOOL logic for packages, which need patches to - the autotool infrastructure - add grsec kernel patch - check for gcc and SSP again - port full blown perl - port w3m -- update valgrind - port libcec for xbmc - check xbmc samba/nfs support - add support for librtmp in xbmc diff --git a/mk/package.mk b/mk/package.mk index 768ac0b89..b0733f481 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -120,30 +120,43 @@ PKGDESC_$(1)= $(5) PKGSECT_$(1)= $(6) IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX} IPKG_$(1)_DEV= $(PACKAGE_DIR)/$(2)-dev_$(3)_${CPU_ARCH}.${PKG_SUFFIX} +IPKG_$(1)_DBG= $(PACKAGE_DIR)/$(2)-dbg_$(3)_${CPU_ARCH}.${PKG_SUFFIX} IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2) IDIR_$(1)_DEV= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)-dev +IDIR_$(1)_DBG= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)-dbg ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},) -ALL_IPKGS+= $$(IPKG_$(1)) +ALL_IDIRS+= $${IDIR_$(1)} ALL_IDIRS+= $${IDIR_$(1)} ALL_POSTINST+= $(2)-install $(2)-install: endif INFO_$(1)= $(PKG_STATE_DIR)/info/$(2).list INFO_$(1)_DEV= $(PKG_STATE_DIR)/info/$(2)-dev.list +INFO_$(1)_DBG= $(PKG_STATE_DIR)/info/$(2)-dbg.list ifeq ($(ADK_PACKAGE_$(1)),y) +ifeq ($(ADK_PACKAGE_$(1)_DBG),y) +install-targets: $$(INFO_$(1)) $$(INFO_$(1)_DBG) +ifeq ($(ADK_PACKAGE_$(1)_DEV),y) +install-targets: $$(INFO_$(1)) $$(INFO_$(1)_DBG) $$(INFO_$(1)_DEV) +else +install-targets: $$(INFO_$(1)) $$(INFO_$(1)_DBG) +endif +else ifeq ($(ADK_PACKAGE_$(1)_DEV),y) install-targets: $$(INFO_$(1)) $$(INFO_$(1)_DEV) else install-targets: $$(INFO_$(1)) endif endif +endif IDEPEND_$(1):= $$(strip $(4)) _ALL_CONTROLS+= $$(IDIR_$(1))/CONTROL/control ICONTROL_$(1)?= $(WRKDIR)/.$(2).control ICONTROL_$(1)_DEV?= $(WRKDIR)/.$(2)-dev.control +ICONTROL_$(1)_DBG?= $(WRKDIR)/.$(2)-dbg.control $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE} @echo "Package: $$(shell echo $(2) | tr '_' '-')" > $(WRKDIR)/.$(2).control @echo "Section: $(6)" >> $(WRKDIR)/.$(2).control @@ -167,6 +180,13 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE} @for file in conffiles preinst postinst prerm postrm; do \ [ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \ done +ifneq ($(ADK_DEBUG),y) + @echo "Package: $$(shell echo $(2) | tr '_' '-')-dbg" > $(WRKDIR)/.$(2)-dbg.control + @echo "Section: debug" >> $(WRKDIR)/.$(2)-dbg.control + @echo "Description: debugging symbols for $(2)" >> $(WRKDIR)/.$(2)-dbg.control + @${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)_DBG} $${ICONTROL_$(1)_DBG} $(3) ${CPU_ARCH} + @echo "Depends: $$(shell echo $(2) | tr '_' '-')" >> $${IDIR_$(1)_DBG}/CONTROL/control +endif ifneq (,$(filter dev,$(7))) @echo "Package: $$(shell echo $(2) | tr '_' '-')-dev" > $(WRKDIR)/.$(2)-dev.control @echo "Section: devel" >> $(WRKDIR)/.$(2)-dev.control @@ -247,6 +267,9 @@ ifeq (,$(filter libmix,$(7))) ifeq (,$(filter libonly,$(7))) ifeq (,$(filter devonly,$(7))) $${PKG_BUILD} $${IDIR_$(1)} $${PACKAGE_DIR} $(MAKE_TRACE) +ifneq ($(ADK_DEBUG),y) + $${PKG_BUILD} $${IDIR_$(1)_DBG} $${PACKAGE_DIR} $(MAKE_TRACE) +endif endif endif endif @@ -270,6 +293,9 @@ endif $$(INFO_$(1)): $$(IPKG_$(1)) $(PKG_INSTALL) $$(IPKG_$(1)) +$$(INFO_$(1)_DBG): $$(IPKG_$(1)_DBG) + $(PKG_INSTALL) $$(IPKG_$(1)_DBG) + ifneq ($(1),UCLIBC) ifneq ($(1),EGLIBC) ifneq ($(1),GLIBC) diff --git a/mk/vars.mk b/mk/vars.mk index bb7bd52b9..e7a130e8c 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -132,6 +132,8 @@ TARGET_CPPFLAGS+= -DNDEBUG TARGET_CFLAGS+= -fomit-frame-pointer $(TARGET_OPTIMIZATION) # stop generating eh_frame stuff TARGET_CFLAGS+= -fno-unwind-tables -fno-asynchronous-unwind-tables +# always add debug information +TARGET_CFLAGS+= -g3 endif diff --git a/package/base-files/Config.in.manual b/package/base-files/Config.in.manual index 68d22bbd2..2a6accef0 100644 --- a/package/base-files/Config.in.manual +++ b/package/base-files/Config.in.manual @@ -4,7 +4,7 @@ config ADK_COMPILE_BASE_FILES default n config ADK_PACKAGE_BASE_FILES - prompt "base-files............. basic filesystem structure and scripts" + prompt "base-files........... basic filesystem structure and scripts" tristate select ADK_COMPILE_BASE_FILES depends on !ADK_TOOLCHAIN_ONLY @@ -13,7 +13,7 @@ config ADK_PACKAGE_BASE_FILES basic filesystem structure and scripts config ADK_PACKAGE_CONFIG_IN_ETC - prompt ".config in /etc...... include buildsystem configuration in image" + prompt ".config in /etc.... include buildsystem configuration in image" bool depends on ADK_PACKAGE_BASE_FILES default y if !ADK_TOOLCHAIN_ONLY diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual index 9abe2774d..e675ca47a 100644 --- a/package/busybox/Config.in.manual +++ b/package/busybox/Config.in.manual @@ -4,7 +4,7 @@ config ADK_COMPILE_BUSYBOX default n config ADK_PACKAGE_BUSYBOX - prompt "busybox................ Core utilities for embedded systems" + prompt "busybox.............. core utilities for embedded systems" boolean select ADK_COMPILE_BUSYBOX default y if !ADK_TOOLCHAIN_ONLY diff --git a/package/eglibc/Config.in.manual b/package/eglibc/Config.in.manual index da237f79e..9c45c4c66 100644 --- a/package/eglibc/Config.in.manual +++ b/package/eglibc/Config.in.manual @@ -8,6 +8,15 @@ config ADK_PACKAGE_EGLIBC help embedded GNU C library. +config ADK_PACKAGE_EGLIBC_DBG + prompt "debug symbols package" + tristate + depends on ADK_PACKAGE_EGLIBC + depends on ADK_PACKAGE_GDB + depends on !ADK_DEBUG + default n + help + config ADK_PACKAGE_EGLIBC_STATIC prompt "eglibc-static........ C library (static version)" tristate diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 0c8cb1906..6e5acdc32 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -7,8 +7,8 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc PKG_NAME:= gdb PKG_DESCR:= GNU debugger PKG_SECTION:= debug -PKG_DEPENDS:= libthread-db libncurses libexpat libgcc -PKG_BUILDDEP:= ncurses readline libiconv-tiny expat +PKG_DEPENDS:= libthread-db libncurses libexpat libgcc zlib +PKG_BUILDDEP:= ncurses readline libiconv-tiny expat zlib PKG_NOPARALLEL:= 1 PKG_ARCH_DEPENDS:= !cris !avr32 !m68k diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index f936dcbdd..b4c1fd139 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -4,15 +4,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= valgrind -PKG_VERSION:= 3.7.0 +PKG_VERSION:= 3.9.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= a855fda56edf05614f099dca316d1775 +PKG_MD5SUM:= 0947de8112f946b9ce64764af7be6df2 PKG_DESCR:= memory management debugging PKG_SECTION:= debug +PKG_BUILDDEP:= autotool PKG_URL:= http://valgrind.org/ PKG_SITES:= http://valgrind.org/downloads/ -PKG_ARCH_DEPENDS:= x86 x86_64 native arm +PKG_ARCH_DEPENDS:= ppc ppc64 mips mipsel mips64 mips64el x86 x86_64 arm native DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 @@ -20,10 +21,13 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,VALGRIND,valgrind,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf +ifeq ($(ADK_TARGET_LIB_MUSL),y) +TARGET_CPPFLAGS+= -D__MUSL__ +endif CONFIGURE_ENV+= ac_cv_file__proc_self_fd=yes \ ac_cv_file__proc_self_exe=yes \ ac_cv_file__proc_self_maps=yes -CONFIGURE_ARGS+= --disable-tls valgrind-install: $(INSTALL_DIR) $(IDIR_VALGRIND)/usr/bin diff --git a/package/valgrind/patches/patch-Makefile_all_am b/package/valgrind/patches/patch-Makefile_all_am deleted file mode 100644 index 159ca73df..000000000 --- a/package/valgrind/patches/patch-Makefile_all_am +++ /dev/null @@ -1,14 +0,0 @@ ---- valgrind-3.7.0.orig/Makefile.all.am 2011-10-26 23:24:45.000000000 +0200 -+++ valgrind-3.7.0/Makefile.all.am 2013-07-23 12:27:45.000000000 +0200 -@@ -160,9 +160,9 @@ AM_CCASFLAGS_PPC64_LINUX = $(AM_CPPFLAG - - AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@ - AM_CFLAGS_ARM_LINUX = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \ -- $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8 -+ $(AM_CFLAGS_BASE) @VGCONF_PLATFORM_ARM_ARCH@ - AM_CCASFLAGS_ARM_LINUX = $(AM_CPPFLAGS_ARM_LINUX) @FLAG_M32@ \ -- -marm -mcpu=cortex-a8 -g -+ @VGCONF_PLATFORM_ARM_ARCH@ -g - - AM_FLAG_M3264_X86_DARWIN = -arch i386 - AM_CFLAGS_X86_DARWIN = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \ diff --git a/package/valgrind/patches/patch-Makefile_am b/package/valgrind/patches/patch-Makefile_am new file mode 100644 index 000000000..9dd9e396b --- /dev/null +++ b/package/valgrind/patches/patch-Makefile_am @@ -0,0 +1,10 @@ +--- valgrind-3.9.0.orig/Makefile.am 2013-10-23 12:50:02.000000000 +0200 ++++ valgrind-3.9.0/Makefile.am 2013-11-03 15:52:11.000000000 +0100 +@@ -4,7 +4,6 @@ AUTOMAKE_OPTIONS = foreign 1.10 dist-bzi + include $(top_srcdir)/Makefile.all.am + + TOOLS = memcheck \ +- cachegrind \ + callgrind \ + massif \ + lackey \ diff --git a/package/valgrind/patches/patch-Makefile_in b/package/valgrind/patches/patch-Makefile_in deleted file mode 100644 index 35d1ff5e1..000000000 --- a/package/valgrind/patches/patch-Makefile_in +++ /dev/null @@ -1,522 +0,0 @@ ---- valgrind-3.7.0.orig/Makefile.in 2011-11-05 12:26:55.000000000 +0100 -+++ valgrind-3.7.0/Makefile.in 2013-07-23 12:27:52.000000000 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.10.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -26,9 +26,8 @@ - - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ --pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ --pkglibexecdir = $(libexecdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c -@@ -63,7 +62,6 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = config.h - CONFIG_CLEAN_FILES = valgrind.spec valgrind.pc glibc-2.X.supp \ - drd/scripts/download-and-build-splash2 --CONFIG_CLEAN_VPATH_FILES = - SCRIPTS = $(dist_noinst_SCRIPTS) - SOURCES = - DIST_SOURCES = -@@ -79,65 +77,25 @@ am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; --am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; --am__install_max = 40 --am__nobase_strip_setup = \ -- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` --am__nobase_strip = \ -- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" --am__nobase_list = $(am__nobase_strip_setup); \ -- for p in $$list; do echo "$$p $$p"; done | \ -- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ -- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ -- if (++n[$$2] == $(am__install_max)) \ -- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ -- END { for (dir in files) print dir, files[dir] }' --am__base_list = \ -- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ -- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; - am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkglibdir)" \ - "$(DESTDIR)$(pkgincludedir)" -+pkgconfigDATA_INSTALL = $(INSTALL_DATA) -+pkglibDATA_INSTALL = $(INSTALL_DATA) - DATA = $(dist_noinst_DATA) $(pkgconfig_DATA) $(pkglib_DATA) -+pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) - HEADERS = $(pkginclude_HEADERS) - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -- distdir dist dist-all distcheck - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) - am__remove_distdir = \ -- { test ! -d "$(distdir)" \ -- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ -- && rm -fr "$(distdir)"; }; } --am__relativize = \ -- dir0=`pwd`; \ -- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ -- sed_rest='s,^[^/]*/*,,'; \ -- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ -- sed_butlast='s,/*[^/]*$$,,'; \ -- while test -n "$$dir1"; do \ -- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ -- if test "$$first" != "."; then \ -- if test "$$first" = ".."; then \ -- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ -- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ -- else \ -- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ -- if test "$$first2" = "$$first"; then \ -- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ -- else \ -- dir2="../$$dir2"; \ -- fi; \ -- dir0="$$dir0"/"$$first"; \ -- fi; \ -- fi; \ -- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ -- done; \ -- reldir="$$dir2" -+ { test ! -d $(distdir) \ -+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ -+ && rm -fr $(distdir); }; } - DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 - GZIP_ENV = --best - distuninstallcheck_listfiles = find . -type f -print -@@ -224,6 +182,7 @@ VERSION = @VERSION@ - VGCONF_ARCH_PRI = @VGCONF_ARCH_PRI@ - VGCONF_ARCH_SEC = @VGCONF_ARCH_SEC@ - VGCONF_OS = @VGCONF_OS@ -+VGCONF_PLATFORM_ARM_ARCH = @VGCONF_PLATFORM_ARM_ARCH@ - VGCONF_PLATFORM_PRI_CAPS = @VGCONF_PLATFORM_PRI_CAPS@ - VGCONF_PLATFORM_SEC_CAPS = @VGCONF_PLATFORM_SEC_CAPS@ - VGCONF_PLATVARIANT = @VGCONF_PLATVARIANT@ |