diff options
33 files changed, 288 insertions, 79 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index c4b3ba803..73ecb707c 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -71,7 +71,7 @@ $(eval $(call KMOD_template,MAC80211,mac80211,\ $(eval $(call KMOD_template,ATH5K,ath5k,\ $(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath \ $(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath5k/ath5k \ -,20, kmod-leds-class)) +,20)) $(eval $(call KMOD_template,P54_COMMON,p54-common,\ $(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54common \ diff --git a/package/automake/Makefile b/package/automake/Makefile index 97525341e..0b289702f 100644 --- a/package/automake/Makefile +++ b/package/automake/Makefile @@ -10,7 +10,6 @@ PKG_EXTRAVER:= 1.11 PKG_MD5SUM:= 4ee7f0ff5f0e467d58b6bd5da96b1c74 PKG_DESCR:= GNU automake PKG_SECTION:= lang -PKG_DEPENDS:= microperl PKG_URL:= http://www.gnu.org/software/automake/ PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/} PKG_OPTS:= noscripts diff --git a/package/bison/Makefile b/package/bison/Makefile index fd31a0fe7..f468e1576 100644 --- a/package/bison/Makefile +++ b/package/bison/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bison PKG_VERSION:= 2.4.3 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= ea45c778b36bdc7a720096819e292a73 PKG_DESCR:= GNU parser generator PKG_SECTION:= lang @@ -20,5 +20,6 @@ post-install: ${INSTALL_DIR} ${IDIR_BISON}/usr/bin ${IDIR_BISON}/usr/share/bison ${INSTALL_BIN} ${WRKINST}/usr/bin/bison ${IDIR_BISON}/usr/bin ${CP} ${WRKINST}/usr/share/bison/* ${IDIR_BISON}/usr/share/bison + $(CP) ./files/yacc ${IDIR_BISON}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bison/files/yacc b/package/bison/files/yacc new file mode 100755 index 000000000..8681b8f54 --- /dev/null +++ b/package/bison/files/yacc @@ -0,0 +1,2 @@ +#!/bin/sh +bison -y "$@" diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index 491814c63..06d4c40ce 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cryptsetup -PKG_VERSION:= 1.1.3 +PKG_VERSION:= 1.3.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 318a64470861ea5b92a52f2014f1e7c1 +PKG_MD5SUM:= 1f5b5a9d538e8a3c191fb7dd85b9b013 PKG_DESCR:= LUKS cryptsetup tools PKG_SECTION:= crypto PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt diff --git a/package/cryptsetup/patches/patch-ltmain_sh b/package/cryptsetup/patches/patch-ltmain_sh index 4aa161aec..18ec3a2e4 100644 --- a/package/cryptsetup/patches/patch-ltmain_sh +++ b/package/cryptsetup/patches/patch-ltmain_sh @@ -1,11 +1,11 @@ ---- cryptsetup-1.1.3.orig/ltmain.sh 2010-01-17 11:29:15.000000000 +0100 -+++ cryptsetup-1.1.3/ltmain.sh 2011-01-14 20:48:34.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files +--- cryptsetup-1.3.1.orig/ltmain.sh 2011-04-18 13:06:09.000000000 +0200 ++++ cryptsetup-1.3.1/ltmain.sh 2011-07-18 13:28:01.000000000 +0200 +@@ -5840,7 +5840,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 8c8788b2a..cd2c3caeb 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= e2fsprogs PKG_VERSION:= 1.41.14 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 05f70470aea2ef7efbb0845b2b116720 PKG_DESCR:= Ext2/3/4 filesystem utilities PKG_SECTION:= fs @@ -116,9 +116,9 @@ libuuid-install: ${IDIR_LIBUUID}/usr/lib libuuid-dev-install: - ${INSTALL_DIR} ${IDIR_LIBUUID_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBUUID_DEV}/usr/include/uuid ${CP} ${WRKBUILD}/lib/uuid/uuid.h \ - ${IDIR_LIBUUID_DEV}/usr/include + ${IDIR_LIBUUID_DEV}/usr/include/uuid e2fsck-static-install: ifneq ($(ADK_PACKAGE_E2FSCK_STATIC),) diff --git a/package/eglibc/Config.in.manual b/package/eglibc/Config.in.manual index d74c585f8..0e7598edf 100644 --- a/package/eglibc/Config.in.manual +++ b/package/eglibc/Config.in.manual @@ -7,6 +7,14 @@ config ADK_PACKAGE_EGLIBC help embedded GNU C library. +config ADK_PACKAGE_EGLIBC_STATIC + prompt "eglibc-static........ C library (static version)" + tristate + default n + depends on ADK_TARGET_LIB_EGLIBC + help + embedded GNU C library (static version). + config ADK_PACKAGE_EGLIBC_DEV prompt "eglibc-dev........... C library development files" tristate diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 0b5956431..5bf290fe9 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/toolchain/eglibc/Makefile.inc PKG_DESCR:= embedded GNU C library PKG_SECTION:= base PKG_OPTS:= noremove -PKG_SUBPKGS:= EGLIBC EGLIBC_DEV +PKG_SUBPKGS:= EGLIBC EGLIBC_DEV EGLIBC_STATIC NO_DISTFILES:= 1 @@ -15,6 +15,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,EGLIBC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,EGLIBC_DEV,$(PKG_NAME)-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,EGLIBC_STATIC,$(PKG_NAME)-static,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIG_STYLE:= manual BUILD_STYLE:= manual @@ -82,6 +83,10 @@ endif ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/nscd.conf ${IDIR_EGLIBC}/etc ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/nsswitch.conf ${IDIR_EGLIBC}/etc +eglibc-static-install: + ${INSTALL_DIR} $(IDIR_EGLIBC_STATIC)/usr/lib + $(CP) $(STAGING_TARGET_DIR)/usr/lib/libc.a $(IDIR_EGLIBC_STATIC)/usr/lib + eglibc-dev-install: ${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/lib $(IDIR_EGLIBC_DEV)/usr/lib # install linker script diff --git a/package/libcapi20/Makefile b/package/libcapi20/Makefile index 689f8f40c..3ecc85245 100644 --- a/package/libcapi20/Makefile +++ b/package/libcapi20/Makefile @@ -1,22 +1,36 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk +include ${TOPDIR}/rules.mk PKG_NAME:= libcapi20 -PKG_VERSION:= 3.0.5-cm +PKG_VERSION:= 3.0.5-cm2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 230fce089ea094742021f90e4884ce8a +PKG_MD5SUM:= cf81d182fe7a4dbab61bce929824db2c PKG_DESCR:= CAPI library PKG_SECTION:= libs +PKG_URL:= ftp://ftp.melware.net/capi-utils/ PKG_SITES:= ftp://ftp.melware.net/capi-utils/ -include $(TOPDIR)/mk/package.mk +PKG_SUBPKGS:= LIBCAPI20 LIBCAPI20_DEV +PKGSD_LIBCAPI20_DEV:= header files for libcapi20 library +PKGSC_LIBCAPI20_DEV:= devel -$(eval $(call PKG_template,LIBCAPI20,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq ($(ADK_STATIC),y) +PKG_OPTS:= libonly +endif -post-install: - $(INSTALL_DIR) $(IDIR_LIBCAPI20)/usr/lib - ${CP} ${WRKINST}/usr/lib/libcapi20.so* ${IDIR_LIBCAPI20}/usr/lib +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,LIBCAPI20,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBCAPI20_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCAPI20_DEV},${PKGSC_LIBCAPI20_DEV},${PKG_OPTS})) + +libcapi20-install: + ${INSTALL_DIR} ${IDIR_LIBCAPI20}/usr/lib + ${CP} ${WRKINST}/usr/lib/libcapi*.so* ${IDIR_LIBCAPI20}/usr/lib + +libcapi20-dev-install: + ${INSTALL_DIR} ${IDIR_LIBCAPI20_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBCAPI20_DEV}/usr/include include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/lvm/Makefile b/package/lvm/Makefile index 7863fe58e..981aa21b6 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= lvm PKG_VERSION:= 2.02.80 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 816f4cee75674e3a21fd40f1961279f2 PKG_DESCR:= logical volume management PKG_SECTION:= fs @@ -13,11 +13,13 @@ PKG_DEPENDS:= libdevmapper libncurses PKG_URL:= http://sourceware.org/lvm2/ PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/ -PKG_SUBPKGS:= LVM DEVICE_MAPPER LIBDEVMAPPER +PKG_SUBPKGS:= LVM DEVICE_MAPPER LIBDEVMAPPER LIBDEVMAPPER_DEV PKGSD_DEVICE_MAPPER:= device-mapper utility PKGSS_DEVICE_MAPPER:= libdevmapper PKGSD_LIBDEVMAPPER:= device-mapper library PKGSC_LIBDEVMAPPER:= libs +PKGSD_LIBDEVMAPPER_DEV:=device-mapper headers +PKGSC_LIBDEVMAPPER_DEV:=devel DISTFILES:= LVM2.${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION} @@ -27,6 +29,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_DEVICE_MAPPER},${PKG_SECTION})) $(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBDEVMAPPER},${PKGSC_LIBDEVMAPPER})) +$(eval $(call PKG_template,LIBDEVMAPPER_DEV,libdevmapper-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBDEVMAPPER_DEV},${PKGSC_LIBDEVMAPPER_DEV})) CONFIGURE_ARGS+= --with-user="" --with-group="" \ --with-optimisation="" \ @@ -41,6 +44,11 @@ libdevmapper-install: ${CP} ${WRKINST}/usr/lib/libdevmapper.so* \ ${IDIR_LIBDEVMAPPER}/usr/lib +libdevmapper-dev-install: + ${INSTALL_DIR} ${IDIR_LIBDEVMAPPER_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* \ + ${IDIR_LIBDEVMAPPER_DEV}/usr/include + device-mapper-install: ${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \ diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 734d7266e..738172650 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mpd -PKG_VERSION:= 0.16.2 +PKG_VERSION:= 0.16.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= a75ad715cc381dc5efeff6dbf313a954 +PKG_MD5SUM:= 0ec5063ebaf8589a4cdfea8f66ffbeea PKG_DESCR:= A music player daemon PKG_SECTION:= multimedia PKG_DEPENDS:= glib libstdcxx diff --git a/package/mpd/patches/patch-src_output_alsa_plugin_c b/package/mpd/patches/patch-src_output_alsa_plugin_c index 8e0e6bb80..98479eb7d 100644 --- a/package/mpd/patches/patch-src_output_alsa_plugin_c +++ b/package/mpd/patches/patch-src_output_alsa_plugin_c @@ -1,3 +1,5 @@ +* will be better solved in mpd 1.16.4 + --- mpd-0.16.2.orig/src/output/alsa_plugin.c 2011-03-19 01:41:53.000000000 +0100 +++ mpd-0.16.2/src/output/alsa_plugin.c 2011-05-14 13:44:14.000000000 +0200 @@ -646,8 +646,9 @@ alsa_play(void *data, const void *chunk, diff --git a/package/openct/Makefile b/package/openct/Makefile index b2e5e8a79..2267c1b5e 100644 --- a/package/openct/Makefile +++ b/package/openct/Makefile @@ -38,12 +38,15 @@ post-install: ${INSTALL_DATA} ${WRKBUILD}/etc/openct.conf \ ${IDIR_OPENCT}/etc ${INSTALL_DIR} ${IDIR_LIBOPENCT}/usr/lib - ${CP} ${WRKINST}/usr/lib/libopenct.so.* \ + ${CP} ${WRKINST}/usr/lib/libopenct.so* \ ${IDIR_LIBOPENCT}/usr/lib libopenct-dev-install: ${INSTALL_DIR} ${IDIR_LIBOPENCT_DEV}/usr/include/openct ${CP} ${WRKINST}/usr/include/openct/*.h \ ${IDIR_LIBOPENCT_DEV}/usr/include/openct + ${INSTALL_DIR} ${IDIR_LIBOPENCT_DEV}/usr/lib/pkgconfig + ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ + ${IDIR_LIBOPENCT_DEV}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/opensc/Makefile b/package/opensc/Makefile index 4957b9fe4..0221fbe25 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= 98fa151e947941f9c3f27420fdf47c11 PKG_DESCR:= utilities to access smart cards PKG_SECTION:= crypto -PKG_BUILDDEP:= openct pcsc-lite openssl -PKG_DEPENDS:= libopensc libopenct pcsc-lite libopenssl +PKG_BUILDDEP:= openct pcsc-lite openssl readline +PKG_DEPENDS:= libopensc libopenct pcsc-lite libopenssl libreadline PKG_URL:= http://www.opensc-project.org/opensc/ PKG_SITES:= http://www.opensc-project.org/files/opensc/ diff --git a/package/openssl/Makefile b/package/openssl/Makefile index cf7d657fa..fac054ca5 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -84,5 +84,7 @@ openssl-util-install: libopenssl-dev-install: ${INSTALL_DIR} ${IDIR_LIBOPENSSL_DEV}/usr/include ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBOPENSSL_DEV}/usr/include + $(CP) $(STAGING_TARGET_DIR)/usr/include/crypto/cryptodev.h \ + $(IDIR_LIBOPENSSL_DEV)/usr/include include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pcmciautils/Makefile b/package/pcmciautils/Makefile index 9b319a1e1..1855f3ee6 100644 --- a/package/pcmciautils/Makefile +++ b/package/pcmciautils/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pcmciautils -PKG_VERSION:= 017 +PKG_VERSION:= 018 PKG_RELEASE:= 1 -PKG_MD5SUM:= ee5837214d297661c8b8189055a351fc +PKG_MD5SUM:= 3c388cb559975b37a75cb5965e9800a9 PKG_DESCR:= Utilities for PCMCIA subsystem PKG_SECTION:= utils PKG_BUILDDEP:= sysfsutils diff --git a/package/pcmciautils/patches/patch-Makefile b/package/pcmciautils/patches/patch-Makefile index cb1f0e162..d49a761a8 100644 --- a/package/pcmciautils/patches/patch-Makefile +++ b/package/pcmciautils/patches/patch-Makefile @@ -1,6 +1,6 @@ --- pcmciautils-017.orig/Makefile 2010-01-06 16:47:45.000000000 +0100 -+++ pcmciautils-017/Makefile 2010-07-30 17:34:46.000000000 +0200 -@@ -94,12 +94,13 @@ PWD = $(shell pwd) ++++ pcmciautils-017/Makefile 2011-07-15 12:41:55.000000000 +0200 +@@ -94,16 +94,19 @@ PWD = $(shell pwd) # If you are running a cross compiler, you may want to set this # to something more interesting, like "arm-linux-". If you want # to compile vs uClibc, that can be done here as well. @@ -15,7 +15,22 @@ HOSTCC = gcc export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS ARCH_LIB_OBJS CRT0 -@@ -264,30 +265,31 @@ clean: + ++CFLAGS ?= ++ + # code taken from uClibc to determine the current arch + ARCH := ${shell $(CC) -dumpmachine | sed -e s'/-.*//' -e 's/i.86/i386/' -e 's/sparc.*/sparc/' \ + -e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/powerpc/ppc/g'} +@@ -215,7 +218,7 @@ all: ccdv $(PCCARDCTL) $(PCMCIA_CHECK_BR + ccdv: build/ccdv + build/ccdv: build/ccdv.c + @echo "Building ccdv" +- @$(HOSTCC) -O1 $< -o $@ ++ $(HOSTCC) $(CFLAGS_FOR_BUILD) -O1 $< -o $@ + + %.o : %.c ccdv + $(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< +@@ -264,30 +267,31 @@ clean: install-hotplug: $(INSTALL) -d $(DESTDIR)$(hotplugdir) @@ -54,7 +69,7 @@ uninstall-tools: - rm -f $(DESTDIR)$(sbindir)/$(PCCARDCTL) -@@ -296,22 +298,24 @@ uninstall-tools: +@@ -296,22 +300,24 @@ uninstall-tools: install-config: $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir) diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile index 096625b96..f53637a56 100644 --- a/package/pcsc-lite/Makefile +++ b/package/pcsc-lite/Makefile @@ -39,5 +39,8 @@ post-install: pcsc-lite-dev-install: ${INSTALL_DIR} ${IDIR_PCSC_LITE_DEV}/usr/include ${CP} ${WRKINST}/usr/include/* ${IDIR_PCSC_LITE_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_PCSC_LITE_DEV}/usr/lib/pkgconfig + ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ + ${IDIR_PCSC_LITE_DEV}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/popt/Makefile b/package/popt/Makefile index 2c355dbfb..aead00fe5 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= popt PKG_VERSION:= 1.16 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 3743beefa3dd6247a73f8f7a32c14c33 PKG_DESCR:= a command line option parsing library PKG_SECTION:= libs @@ -14,7 +14,8 @@ PKG_BUILDDEP:= libiconv PKG_URL:= http://rpm5.org/ PKG_SITES:= http://rpm5.org/files/popt/ -PKG_SUBPKGS:= LIBPOPT +PKG_SUBPKGS:= LIBPOPT LIBPOPT_DEV +PKGSC_LIBPOPT_DEV:= devel ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly @@ -23,9 +24,16 @@ endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBPOPT_DEV,libpopt-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBPOPT_DEV},${PKG_OPTS})) + +TARGET_LDFAGS+= -liconv post-install: ${INSTALL_DIR} ${IDIR_LIBPOPT}/usr/lib - ${CP} ${WRKINST}/usr/lib/libpopt.so* ${IDIR_LIBPOPT}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libpopt.so* ${IDIR_LIBPOPT}/usr/lib + +libpopt-dev-install: + ${INSTALL_DIR} ${IDIR_LIBPOPT_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBPOPT_DEV}/usr/include include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/sysfsutils/Makefile b/package/sysfsutils/Makefile index 33bc0b905..dd4384628 100644 --- a/package/sysfsutils/Makefile +++ b/package/sysfsutils/Makefile @@ -5,16 +5,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:= sysfsutils PKG_VERSION:= 2.1.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 14e7dcd0436d2f49aa403f67e1ef7ddc PKG_DESCR:= utilites built upon sysfs PKG_SECTION:= utils PKG_URL:= http://linux-diag.sourceforge.net/Sysfsutils.html PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-diag/sysfsutils/2.1.0/} +PKG_SUBPKGS:= SYSFSUTILS SYSFSUTILS_DEV +PKGSC_SYSFSUTILS_DEV:= devel + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,SYSFSUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SYSFSUTILS_DEV,sysfsutils-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_SYSFSUTILS_DEV})) post-install: $(INSTALL_DIR) $(IDIR_SYSFSUTILS)/usr/bin @@ -24,4 +28,9 @@ post-install: $(INSTALL_BIN) $(WRKINST)/usr/bin/systool \ $(IDIR_SYSFSUTILS)/usr/bin +sysfsutils-dev-install: + $(INSTALL_DIR) $(IDIR_SYSFSUTILS_DEV)/usr/include + $(CP) $(WRKINST)/usr/include/* \ + $(IDIR_SYSFSUTILS_DEV)/usr/include + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/target/config/Config.in b/target/config/Config.in index f5a9398b5..5162a6c72 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -291,7 +291,9 @@ config ADK_TARGET_CMDLINE default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP default "console=ttyS0,115200 console=tty0 geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 - default "console=ttyS0,115200" + default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 + default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 + default "" # c library config ADK_uclibc diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index f8673351a..e9e735fe3 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -128,6 +128,7 @@ config ADK_KERNEL_ATA_PIIX default y if ADK_TARGET_SYSTEM_QEMU_X86 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n config ADK_KERNEL_SATA_AHCI diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 00c06eb8b..667593de9 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -2,12 +2,14 @@ config ADK_KERNEL_VT boolean default y if ADK_HARDWARE_QEMU default y if ADK_TARGET_WITH_VGA + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n config ADK_KERNEL_VT_CONSOLE boolean default y if ADK_HARDWARE_QEMU default y if ADK_TARGET_WITH_VGA + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n config ADK_KERNEL_FONTS @@ -79,8 +81,9 @@ config ADK_HARDWARE_GRAPHICS_INTEL_I915 select ADK_KERNEL_DRM_I915_KMS select ADK_KERNEL_DRM_I915 default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n - depends on ADK_TARGET_SYSTEM_IBM_X40 + depends on ADK_TARGET_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_IBM_X40 help AGP/DRM/KMS support for Intel chipset i915. diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 3c55fb8dd..4a18af573 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -5,6 +5,7 @@ config ADK_KERNEL_INPUT boolean default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n @@ -13,6 +14,7 @@ config ADK_KERNEL_INPUT_KEYBOARD boolean default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n @@ -21,6 +23,7 @@ config ADK_KERNEL_KEYBOARD_ATKBD boolean default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n @@ -29,6 +32,7 @@ config ADK_KERNEL_INPUT_MOUSE boolean default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n @@ -37,6 +41,7 @@ config ADK_KERNEL_INPUT_MOUSEDEV boolean default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 8acd0dabe..b910eeec5 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -39,8 +39,9 @@ config ADK_KERNEL_RTC_DRV_CMOS default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n - depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40) + depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_IBM_X40) help PC CMOS RTC support. diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia index 201e4c281..ec4acfe48 100644 --- a/target/linux/config/Config.in.multimedia +++ b/target/linux/config/Config.in.multimedia @@ -53,6 +53,7 @@ config ADK_KPACKAGE_KMOD_SND_OSSEMUL select ADK_KERNEL_SND_PCM_OSS select ADK_KPACKAGE_KMOD_SND default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n help ALSA OSS Emulation @@ -63,6 +64,7 @@ config ADK_KPACKAGE_KMOD_SND_INTEL8X0 select ADK_KPACKAGE_KMOD_SND_AC97_CODEC select ADK_KPACKAGE_KMOD_SND default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n depends on ADK_TARGET_WITH_PCI help diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index b45e17ccd..a6251a71d 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -125,6 +125,7 @@ config ADK_KERNEL_E1000 select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_QEMU_X86 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default n @@ -318,6 +319,7 @@ config ADK_KPACKAGE_KMOD_ATH5K select ADK_KPACKAGE_KMOD_MAC80211 depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_AHB default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_FON_FON2100 default n help diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm index 2f90df20c..0c59194a9 100644 --- a/target/linux/config/Config.in.pm +++ b/target/linux/config/Config.in.pm @@ -37,6 +37,7 @@ config ADK_HARDWARE_ACPI select ADK_KERNEL_ACPI_FAN select ADK_KERNEL_ACPI_DOCK default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n help Enable ACPI support. @@ -46,6 +47,7 @@ config ADK_KERNEL_SUSPEND boolean select ADK_KERNEL_PM default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 default n help Enable Suspend-to-RAM and Suspend-to-Disk support. diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 2be0c4f31..6d1108953 100644 --- a/ |