diff options
94 files changed, 2954 insertions, 3165 deletions
diff --git a/mk/image.mk b/mk/image.mk index 78b18e716..e6dd06a82 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -103,9 +103,10 @@ ${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR} echo "CONFIG_BLK_DEV_INITRD=y" >> ${LINUX_DIR}/.config echo 'CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"' >> \ ${LINUX_DIR}/.config + cp $(TOPDIR)/scripts/dev.cpio $@ cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \ sed "s#\(.*\)#:0:0::::::\1#" | sort | \ - ${TOOLS_DIR}/cpio -o -C512 -Hnewc -P >$@ 2>/dev/null + ${TOOLS_DIR}/cpio -o -C512 -Hnewc -A -P -O $@ 2>/dev/null ${BUILD_DIR}/root.squashfs: ${TARGET_DIR} ${STAGING_HOST_DIR}/bin/mksquashfs ${TARGET_DIR} \ diff --git a/mk/mirrors.mk b/mk/mirrors.mk index d820a56b3..30e246334 100644 --- a/mk/mirrors.mk +++ b/mk/mirrors.mk @@ -21,6 +21,7 @@ MASTER_SITE_XORG?= \ http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.6/src/everything/ \ http://xorg.freedesktop.org/releases/X11R7.6/src/everything/ \ http://xorg.freedesktop.org/releases/individual/lib/ \ + http://xorg.freedesktop.org/releases/individual/driver/ \ MASTER_SITE_GNU?= \ http://ftp.gnu.org/gnu/ \ diff --git a/mk/modules.mk b/mk/modules.mk index e51732a4c..0cc7603ad 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -67,6 +67,9 @@ $(eval $(call KMOD_template,RFKILL,rfkill,\ ,10)) $(eval $(call KMOD_template,MAC80211,mac80211,\ + $(MODULES_DIR)/kernel/net/wireless/lib80211 \ + $(MODULES_DIR)/kernel/net/wireless/lib80211_crypt_ccmp \ + $(MODULES_DIR)/kernel/net/wireless/lib80211_crypt_tkip \ $(MODULES_DIR)/kernel/net/wireless/cfg80211 \ $(MODULES_DIR)/kernel/net/mac80211/mac80211 \ ,15, kmod-crypto-aes kmod-crypto-arc4 kmod-crypto-ecb)) @@ -88,6 +91,14 @@ $(eval $(call KMOD_template,B43,b43,\ $(MODULES_DIR)/kernel/drivers/net/wireless/b43/b43 \ ,70)) +$(eval $(call KMOD_template,HOSTAP,hostap,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/hostap/hostap \ +,70)) + +$(eval $(call KMOD_template,HOSTAP_CS,hostap-cs,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/hostap/hostap_cs \ +,75)) + $(eval $(call KMOD_template,P54_USB,p54-usb,\ $(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54usb \ ,70)) @@ -1082,6 +1093,7 @@ $(eval $(call KMOD_template,SOUND,sound,\ $(MODULES_DIR)/kernel/sound/soundcore \ ,30)) + $(eval $(call KMOD_template,SND,snd,\ $(MODULES_DIR)/kernel/sound/core/snd-page-alloc \ $(MODULES_DIR)/kernel/sound/core/snd \ @@ -1121,6 +1133,17 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,snd-cs5535audio,\ $(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \ ,55)) +$(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\ + $(MODULES_DIR)/kernel/sound/soc/snd-soc-core \ + $(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-lib \ + $(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-pcm \ + $(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-ac97 \ + $(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-wm8750 \ + $(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx-i2s \ + $(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx \ + $(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \ +,55)) + #V4L_COMPAT:=drivers/media/video/v4l1-compat #ifeq ($(ADK_LINUX_64),y) #V4L_COMPAT+=drivers/media/video/v4l2-compat-ioctl32 diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 5080944e6..f5e2b74c5 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -9,8 +9,10 @@ endif endef ifeq ($(ADK_HARDWARE_QEMU),y) +ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y) ROOTFS:= root=/dev/sda1 endif +endif ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y) ROOTFS:= root=/dev/sda2 @@ -25,6 +27,10 @@ ifeq ($(ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20),y) ROOTFS:= root=/dev/mmcblk0p2 rootwait endif +ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) +ROOTFS:= root=/dev/sda1 rootwait +endif + ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) USB:= rootwait else diff --git a/package/SDL_gfx/Makefile b/package/SDL_gfx/Makefile new file mode 100644 index 000000000..4dea6018d --- /dev/null +++ b/package/SDL_gfx/Makefile @@ -0,0 +1,29 @@ +# 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 + +PKG_NAME:= SDL_gfx +PKG_VERSION:= 2.0.22 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 330f291f1f09a1bdf397c9b40d92ca41 +PKG_DESCR:= SDL GFX library +PKG_SECTION:= libs +PKG_DEPENDS:= libsdl +PKG_BUILDDEP:= sdl +PKG_URL:= http://www.ferzkopp.net/joomla/content/view/19/14/ +PKG_SITES:= http://www.ferzkopp.net/Software/SDL_gfx-2.0/ + +PKG_SUBPKGS:= LIBSDL_GFX + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBSDL_GFX,libsdl-gfx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --disable-mmx + +libsdl-gfx-install: + $(INSTALL_DIR) $(IDIR_LIBSDL_GFX)/usr/lib + $(CP) $(WRKINST)/usr/lib/libSDL_gfx.so* $(IDIR_LIBSDL_GFX)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/SDL_ttf/Makefile b/package/SDL_ttf/Makefile new file mode 100644 index 000000000..a76e49897 --- /dev/null +++ b/package/SDL_ttf/Makefile @@ -0,0 +1,27 @@ +# 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 + +PKG_NAME:= SDL_ttf +PKG_VERSION:= 2.0.10 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 814e6e17e8879254208d23b3b7e0354b +PKG_DESCR:= TrueType fonts in your SDL applications +PKG_SECTION:= libs +PKG_DEPENDS:= libsdl libfreetype +PKG_BUILDDEP:= sdl freetype +PKG_URL:= http://www.libsdl.org/projects/SDL_ttf/ +PKG_SITES:= http://www.libsdl.org/projects/SDL_ttf/release/ + +PKG_SUBPKGS:= LIBSDL_TTF + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +libsdl-ttf-install: + $(INSTALL_DIR) $(IDIR_LIBSDL_TTF)/usr/lib + $(CP) $(WRKINST)/usr/lib/libSDL_ttf*so* $(IDIR_LIBSDL_TTF)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/alsa-utils/patches/alsa-utils-exp10-workaround.patch b/package/alsa-utils/patches/alsa-utils-exp10-workaround.patch new file mode 100644 index 000000000..f4a520a5c --- /dev/null +++ b/package/alsa-utils/patches/alsa-utils-exp10-workaround.patch @@ -0,0 +1,33 @@ +From da14c5ab2a6e030c5c56c979b8eb3ca071890876 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard <jacmet@sunsite.dk> +Date: Mon, 14 Mar 2011 09:19:18 +0100 +Subject: [PATCH] alsamixer: fix build on uClibc + +exp10 is a glibc extension, which isn't supported on uClibc. Luckily, +exp10() is trivial to compute based on exp(), so add a wrapper for +the uClibc case. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + alsamixer/volume_mapping.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/alsamixer/volume_mapping.c b/alsamixer/volume_mapping.c +index 9cacad8..1c0d7c4 100644 +--- a/alsamixer/volume_mapping.c ++++ b/alsamixer/volume_mapping.c +@@ -37,6 +37,11 @@ + #include <stdbool.h> + #include "volume_mapping.h" + ++#ifdef __UCLIBC__ ++/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */ ++#define exp10(x) (exp((x) * log(10))) ++#endif /* __UCLIBC__ */ ++ + #define MAX_LINEAR_DB_SCALE 24 + + static inline bool use_linear_dB_scale(long dBmin, long dBmax) +-- +1.7.2.3 + diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 4cc7e970a..27ecdaa7c 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 46 +PKG_RELEASE:= 47 PKG_SECTION:= base PKG_DESCR:= basic files and scripts diff --git a/package/base-files/src/init b/package/base-files/src/init index a3232cb9c..a9564011d 100755 --- a/package/base-files/src/init +++ b/package/base-files/src/init @@ -1,7 +1,7 @@ #!/bin/sh echo "System initialization ..." export PATH=/bin:/sbin:/usr/bin:/usr/sbin -mount -t devtmpfs devtmpfs /dev > /dev/null 2>&1 +mount -t devtmpfs devtmpfs /dev >/dev/null 2>&1 mount -nt proc proc /proc mount -o nosuid,nodev,noexec -t sysfs sysfs /sys [ ! -f /etc/notmpfs ] && { @@ -18,6 +18,7 @@ echo >/dev/mdev.seq echo "/sbin/mdev" >/proc/sys/kernel/hotplug mdev -s cat /etc/.rnd >/dev/urandom 2>&1 +[ -x /kexecinit ] && { /kexecinit; } [ -x /cryptinit ] && { /cryptinit; exec switch_root /mnt "/init";} [ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} || mount -o remount,rw / [ -f /etc/fstab ] && { fsck -p >/dev/null; mount -a;} diff --git a/package/cups/Makefile b/package/cups/Makefile index 762f1832a..6a36d424a 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -17,9 +17,13 @@ PKG_NEED_CXX:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-source.tar.bz2 +PKG_SUBPKGS:= CUPS CUPS_DEV +PKGSC_CUPS_DEV:= devel + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,CUPS_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_CUPS_DEV})) CONFIGURE_ENV+= ac_cv_func_sigset=no \ OPTIM='-fPIC' @@ -80,4 +84,8 @@ post-install: ${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/ ${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/ +cups-dev-install: + ${INSTALL_DIR} ${IDIR_CUPS_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_CUPS_DEV}/usr/include + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dillo/Makefile b/package/dillo/Makefile index 81d8751c5..de7c1ba29 100644 --- a/package/dillo/Makefile +++ b/package/dillo/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= dillo -PKG_VERSION:= 2.2 -PKG_RELEASE:= 2 -PKG_MD5SUM:= f8bcd62093f178bed81e46cc54e73f42 +PKG_VERSION:= 3.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 448f44a923222270cb0c84e55adc1be1 PKG_DESCR:= small graphical web browser PKG_SECTION:= x11/apps PKG_DEPENDS:= libfltk libxi libiconv libpng zlib libjpeg @@ -17,7 +17,7 @@ PKG_SITES:= http://www.dillo.org/download/ PKG_NEED_CXX:= 1 PKG_HOST_DEPENDS:= !cygwin -PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el +PKG_ARCH_DEPENDS:= x86 x86_64 mips arm DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/dillo/patches/patch-Makefile_in b/package/dillo/patches/patch-Makefile_in index 6b18010d3..ff0c0c32f 100644 --- a/package/dillo/patches/patch-Makefile_in +++ b/package/dillo/patches/patch-Makefile_in @@ -1,11 +1,11 @@ ---- dillo-2.2.orig/Makefile.in 2010-02-11 11:20:01.000000000 +0100 -+++ dillo-2.2/Makefile.in 2011-01-07 21:37:49.000000000 +0100 +--- dillo-3.0.orig/Makefile.in 2011-09-06 22:55:42.000000000 +0200 ++++ dillo-3.0/Makefile.in 2011-09-12 20:25:51.000482366 +0200 @@ -242,7 +242,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = lout dw dlib dpip src doc dpid dpi test +SUBDIRS = lout dw dlib dpip src doc dpid dpi - EXTRA_DIST = Doxyfile dillorc install-dpi-local + EXTRA_DIST = Doxyfile dillorc install-dpi-local d_size.h sysconf_DATA = dillorc all: config.h diff --git a/package/dillo/patches/patch-configure b/package/dillo/patches/patch-configure deleted file mode 100644 index 222be7882..000000000 --- a/package/dillo/patches/patch-configure +++ /dev/null @@ |