diff options
42 files changed, 759 insertions, 157 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/modules.mk b/mk/modules.mk index e51732a4c..0a68e4096 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -67,6 +67,7 @@ $(eval $(call KMOD_template,RFKILL,rfkill,\ ,10)) $(eval $(call KMOD_template,MAC80211,mac80211,\ + $(MODULES_DIR)/kernel/net/wireless/lib80211 \ $(MODULES_DIR)/kernel/net/wireless/cfg80211 \ $(MODULES_DIR)/kernel/net/mac80211/mac80211 \ ,15, kmod-crypto-aes kmod-crypto-arc4 kmod-crypto-ecb)) @@ -88,6 +89,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)) diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 6b34156a5..f5e2b74c5 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -27,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/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 @@ -1,26 +0,0 @@ ---- dillo-2.2.orig/configure 2010-02-11 11:19:59.000000000 +0100 -+++ dillo-2.2/configure 2011-03-28 02:30:04.373370428 +0200 -@@ -5830,11 +5830,6 @@ typedef unsigned char bool_t; - _______EOF - - --if test "`$CPP -v < /dev/null 2>&1 | grep '/usr/local/include' 2>&1`" = ""; then -- CPPFLAGS="$CPPFLAGS -I/usr/local/include" -- LDFLAGS="$LDFLAGS -L/usr/local/lib" --fi -- - for ac_func in gethostbyname - do : - ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -@@ -6215,9 +6210,9 @@ if test "x$enable_png" = "xyes"; then - $as_echo_n "checking for libpng-config... " >&6; } - - if test -z "$PNG_CONFIG"; then -- PNG_CONFIG=`which libpng12-config` -+ PNG_CONFIG=`which libpng-config` - if test -z "$PNG_CONFIG"; then -- PNG_CONFIG=`which libpng-config` -+ PNG_CONFIG=`which libpng15-config` - fi - if test -z "$PNG_CONFIG"; then - PNG_CONFIG=`which libpng10-config` diff --git a/package/dillo/patches/patch-src_IO_Makefile_in b/package/dillo/patches/patch-src_IO_Makefile_in index 242d86f5a..7c59b6168 100644 --- a/package/dillo/patches/patch-src_IO_Makefile_in +++ b/package/dillo/patches/patch-src_IO_Makefile_in @@ -1,9 +1,9 @@ ---- dillo-2.2.orig/src/IO/Makefile.in 2010-02-11 11:20:01.000000000 +0100 -+++ dillo-2.2/src/IO/Makefile.in 2011-01-07 21:38:15.000000000 +0100 -@@ -188,7 +188,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AM_CPPFLAGS = -DDILLO_BINDIR='"$(bindir)/"' +--- dillo-3.0.orig/src/IO/Makefile.in 2011-09-06 22:55:42.000000000 +0200 ++++ dillo-3.0/src/IO/Makefile.in 2011-09-12 20:24:41.527983361 +0200 +@@ -191,7 +191,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -DDILLO_BINDIR='"$(bindir)/"' + -AM_CFLAGS = @LIBFLTK_CFLAGS@ +AM_CFLAGS = AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@ diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index cd2c3caeb..7b76c5629 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -15,8 +15,11 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} PKG_CFLINE_E2FSPROGS:= default y if ADK_TARGET_ROOTFS_CF -PKG_SUBPKGS:= E2FSPROGS LIBUUID LIBCOM_ERR LIBSS LIBBLKID E2FSCK_STATIC +PKG_SUBPKGS:= LIBE2FS LIBUUID LIBCOM_ERR LIBSS LIBBLKID E2FSCK_STATIC PKG_SUBPKGS+= LIBCOM_ERR_DEV LIBSS_DEV LIBUUID_DEV LIBBLKID_DEV +PKG_SUBPKGS+= RESIZE2FS TUNE2FS E2FSCK MKE2FS +PKGSD_LIBE2FS:= e2fsprogs library +PKGSC_LIBE2FS:= libs PKGSD_LIBUUID:= UUID library PKGSC_LIBUUID:= libs PKGSD_LIBUUID_DEV:= UUID headers @@ -35,10 +38,22 @@ PKGSD_LIBBLKID_DEV:= blkid headers PKGSC_LIBBLKID_DEV:= devel PKGSD_E2FSCK_STATIC:= Static build of e2fsck PKGSC_E2FSCK_STATIC:= fs +PKGSD_RESIZE2FS:= Resize FS utility +PKGSC_RESIZE2FS:= fs +PKGSS_RESIZE2FS:= libe2fs +PKGSD_TUNE2FS:= Tune2FS utility +PKGSC_TUNE2FS:= fs +PKGSS_TUNE2FS:= libe2fs +PKGSD_E2FSCK:= E2fsck utility +PKGSC_E2FSCK:= fs +PKGSS_E2FSCK:= libe2fs +PKGSD_MKE2FS:= Mke2fs utility +PKGSC_MKE2FS:= fs +PKGSS_MKE2FS:= libe2fs include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBE2FS,libe2fs,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBE2FS},${PKGSC_LIBE2FS})) $(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBUUID},${PKGSC_LIBUUID})) $(eval $(call PKG_template,LIBUUID_DEV,libuuid-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBUUID_DEV},${PKGSC_LIBUUID_DEV})) $(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR},${PKGSC_LIBCOM_ERR})) @@ -48,6 +63,10 @@ $(eval $(call PKG_template,LIBSS_DEV,libss-dev,${PKG_VERSION}-${PKG_RELEASE},,${ $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID},${PKGSC_LIBBLKID})) $(eval $(call PKG_template,LIBBLKID_DEV,libblkid-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID_DEV},${PKGSC_LIBBLKID_DEV})) $(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC})) +$(eval $(call PKG_template,TUNE2FS,tune2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_TUNE2FS),${PKGSD_TUNE2FS},${PKGSC_TUNE2FS})) +$(eval $(call PKG_template,RESIZE2FS,resize2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_RESIZE2FS),${PKGSD_RESIZE2FS},${PKGSC_RESIZE2FS})) +$(eval $(call PKG_template,MKE2FS,mke2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_MKE2FS),${PKGSD_MKE2FS},${PKGSC_MKE2FS})) +$(eval $(call PKG_template,E2FSCK,e2fsck,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_E2FSCK),${PKGSD_E2FSCK},${PKGSC_E2FSCK})) CONFIGURE_ARGS+= --enable-elf-shlibs --disable-rpath INSTALL_TARGET+= install-libs @@ -67,16 +86,29 @@ ifneq ($(ADK_PACKAGE_E2FSCK_STATIC),) ${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static ${WRKINST}/usr/sbin endif -e2fsprogs-install: - ${INSTALL_DIR} ${IDIR_E2FSPROGS}/etc - ${INSTALL_DATA} ${WRKINST}/etc/mke2fs.conf ${IDIR_E2FSPROGS}/etc - ${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/lib ${IDIR_E2FSPROGS}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSPROGS}/usr/sbin - cd $(IDIR_E2FSPROGS)/usr/sbin && ln -sf e2fsck fsck.ext2 - ${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_E2FSPROGS}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_E2FSPROGS}/usr/sbin +libe2fs-install: + ${INSTALL_DIR} ${IDIR_LIBE2FS}/etc + ${INSTALL_DATA} ${WRKINST}/etc/mke2fs.conf ${IDIR_LIBE2FS}/etc + ${INSTALL_DIR} ${IDIR_LIBE2FS}/usr/lib ${CP} ${WRKINST}/usr/lib/lib{e2p,ext2fs}.so.* \ - ${IDIR_E2FSPROGS}/usr/lib + ${IDIR_LIBE2FS}/usr/lib + +e2fsck-install: + ${INSTALL_DIR} ${IDIR_E2FSCK}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSCK}/usr/sbin + cd $(IDIR_E2FSCK)/usr/sbin && ln -sf e2fsck fsck.ext2 + +mke2fs-install: + ${INSTALL_DIR} ${IDIR_MKE2FS}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_MKE2FS}/usr/sbin + +tune2fs-install: + ${INSTALL_DIR} ${IDIR_TUNE2FS}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_TUNE2FS}/usr/sbin + +resize2fs-install: + ${INSTALL_DIR} ${IDIR_RESIZE2FS}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/resize2fs ${IDIR_RESIZE2FS}/usr/sbin libblkid-install: ${INSTALL_DIR} ${IDIR_LIBBLKID}/usr/lib diff --git a/package/fltk/Makefile b/package/fltk/Makefile index 59c6cdcff..d727bb7f6 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -4,22 +4,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:= fltk -PKG_VERSION:= 2.0 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 557544badbacca4ee1ebb2448f6e1f8a +PKG_VERSION:= 1.3.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 92f6e29921227eec3426a07425c71232 PKG_DESCR:= fast light toolkit PKG_SECTION:= libs PKG_BUILDDEP:= libX11 libXi MesaLib freeglut freetype PKG_URL:= http://www.fltk.org/ -PKG_SITES:= http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/ +PKG_SITES:= http://openadk.org/distfiles/ PKG_NEED_CXX:= 1 PKG_CXX:= LIBFLTK PKG_SUBPKGS:= LIBFLTK -PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el +PKG_ARCH_DEPENDS:= x86 x86_64 mips arm -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.x-r7513.tar.bz2 -WRKDIST= ${WRKDIR}/${PKG_NAME}-2.0.x-r7513 +DISTFILES:= ${PKG_NAME}-$(PKG_VERSION)-source.tar.gz include $(TOPDIR)/mk/package.mk diff --git a/package/fltk/patches/patch-Makefile b/package/fltk/patches/patch-Makefile index 466aef887..568110189 100644 --- a/package/fltk/patches/patch-Makefile +++ b/package/fltk/patches/patch-Makefile @@ -1,11 +1,11 @@ ---- fltk-2.0.x-r7513.orig/Makefile 2010-04-15 18:29:49.000000000 +0200 -+++ fltk-2.0.x-r7513/Makefile 2011-01-14 22:01:49.000000000 +0100 -@@ -25,7 +25,7 @@ +--- fltk-1.3.0.orig/Makefile 2011-02-15 16:29:03.000000000 +0100 ++++ fltk-1.3.0/Makefile 2011-09-12 20:20:27.137980830 +0200 +@@ -27,7 +27,7 @@ include makeinclude --DIRS = src $(LOCALIMAGES) images OpenGL fluid glut test -+DIRS = src $(LOCALIMAGES) images OpenGL fluid +-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation ++DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation - all: makeinclude + all: makeinclude fltk-config for dir in $(DIRS); do\ diff --git a/package/fltk/patches/patch-OpenGL_Makefile b/package/fltk/patches/patch-OpenGL_Makefile deleted file mode 100644 index 71ac77285..000000000 --- a/package/fltk/patches/patch-OpenGL_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- fltk-2.0.x-r7513.orig/OpenGL/Makefile 2008-08-05 01:03:58.000000000 +0200 -+++ fltk-2.0.x-r7513/OpenGL/Makefile 2011-03-25 13:56:09.304620874 +0100 -@@ -102,7 +102,7 @@ include makedepend - - ../lib/$(DSONAME): $(OBJECTS) - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(OBJECTS) -+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) - $(RM) ../lib/$(DSOLINK) - $(LN) $(DSONAME) ../lib/$(DSOLINK) - diff --git a/package/fltk/patches/patch-configure b/package/fltk/patches/patch-configure deleted file mode 100644 index 613c7b595..000000000 --- a/package/fltk/patches/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- fltk-2.0.x-r7513.orig/configure 2010-04-16 10:02:53.000000000 +0200 -+++ fltk-2.0.x-r7513/configure 2011-03-25 13:52:41.555870814 +0100 -@@ -1770,7 +1770,7 @@ FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_ - - - --uname=`uname` -+uname=Linux - uversion=`uname -r | sed -e '1,$s/[^0-9]//g'` - case $uname in - IRIX*) -@@ -1922,7 +1922,7 @@ if test x$enable_shared = xyes; then - ;; - Linux* | *BSD*) - # DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" -- DSOCOMMAND="\$(CXX) \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" -+ DSOCOMMAND="\$(CXX) -shared -fPIC $DEBUGFLAG -o" - if test "$libdir" != "/usr/lib"; then - DSOLINK="-Wl,-rpath,$libdir" - fi diff --git a/package/fltk/patches/patch-fltk2-config_in b/package/fltk/patches/patch-fltk2-config_in deleted file mode 100644 index c4784688a..000000000 --- a/package/fltk/patches/patch-fltk2-config_in +++ /dev/null @@ -1,27 +0,0 @@ ---- fltk-2.0.x-r7513.orig/fltk2-config.in 2006-04-15 19:43:12.000000000 +0200 -+++ fltk-2.0.x-r7513/fltk2-config.in 2011-01-08 23:34:40.000000000 +0100 -@@ -77,7 +77,6 @@ LDLIBS="@LDFLAGS@ @LIBS@" - # libraries to link with: - LIBNAME="@LIBNAME@" - DSONAME="@DSONAME@" --DSOLINK="@DSOLINK@" - IMAGELIBS="@IMAGELIBS@" - SHAREDSUFFIX="@SHAREDSUFFIX@" - -@@ -168,7 +167,6 @@ do - bindir=${exec_prefix} - includedir=${prefix}/include - libdir=${prefix}/lib -- DSOLINK="-Wl,-rpath,${prefix}/lib" - ;; - --prefix) - echo_prefix=yes -@@ -283,7 +281,7 @@ if test x$use_images = xyes; then - LDSTATIC="$libdir/libfltk2_images.a $LDSTATIC $IMAGELIBS" - fi - --LDLIBS="$DSOLINK $LDLIBS" -+LDLIBS="$LDLIBS" - LDSTATIC="$LDSTATIC_PATHS $LDSTATIC" - - # Answer to user requests diff --git a/package/fltk/patches/patch-images_Makefile b/package/fltk/patches/patch-images_Makefile deleted file mode 100644 index ddd993d18..000000000 --- a/package/fltk/patches/patch-images_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- fltk-2.0.x-r7513.orig/images/Makefile 2008-08-05 01:03:58.000000000 +0200 -+++ fltk-2.0.x-r7513/images/Makefile 2011-03-25 13:53:36.614620804 +0100 -@@ -109,7 +109,7 @@ include makedepend - - ../lib/$(DSONAME): $(OBJECTS) - echo $(DSOCOMMAND) $@ ... -- $(DSOCOMMAND) $@ $(OBJECTS) -+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) - $(RM) ../lib/$(DSOLINK) - $(LN) $(DSONAME) ../lib/$(DSOLINK) - diff --git a/package/fltk/patches/patch-makeinclude_in b/package/fltk/patches/patch-makeinclude_in deleted file mode 100644 index 46a7d397f..000000000 --- a/package/fltk/patches/patch-makeinclude_in +++ /dev/null @@ -1,20 +0,0 @@ ---- fltk-2.0.x-r7513.orig/makeinclude.in 2006-04-11 00:06:06.000000000 +0200 -+++ fltk-2.0.x-r7513/makeinclude.in 2011-03-25 12:03:06.633370885 +0100 -@@ -45,7 +45,7 @@ NROFF = @NROFF@ - RM = rm -f - RMDIR = rm -rf - SHELL = /bin/sh --STRIP = strip -+STRIP = echo - - # compiler names: - CC = @CC@ -@@ -115,7 +115,7 @@ CAT1EXT = @CAT1EXT@ - CAT3EXT = @CAT3EXT@ - - # Be quiet when building... --.SILENT: -+#.SILENT: - - # Build commands and filename extensions... - .SUFFIXES: .0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT) diff --git a/package/giflib/Makefile b/package/giflib/Makefile index 1259c92f9..2187e05ae 100644 --- a/package/giflib/Makefile +++ b/package/giflib/Makefile @@ -12,13 +12,21 @@ PKG_SECTION:= libs PKG_URL:= http://sourceforge.net/projects/giflib/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=giflib/giflib%204.x/$(PKG_NAME)-$(PKG_VERSION)/} +PKG_SUBPKGS:= GIFLIB GIFLIB_DEV +PKGSC_GIFLIB_DEV:= devel + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,GIFLIB,giflib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,GIFLIB_DEV,giflib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_GIFLIB_DEV})) giflib-install: $(INSTALL_DIR) $(IDIR_GIFLIB)/usr/lib $(INSTALL_BIN) $(WRKINST)/usr/lib/libgif.so* \ $(IDIR_GIFLIB)/usr/lib +giflib-dev-install: + ${INSTALL_DIR} ${IDIR_GIFLIB_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/*.h ${IDIR_GIFLIB_DEV}/usr/include + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/kbd/Makefile b/package/kbd/Makefile new file mode 100644 index 000000000..0293849de --- /dev/null +++ b/package/kbd/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:= kbd +PKG_VERSION:= 1.15.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 8143e179a0f3c25646ce5085e8777200 +PKG_DESCR:= keyboard utility +PKG_SECTION:= utils +PKG_SITES:= ftp://ftp.altlinux.org/pub/people/legion/kbd/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,KBD,kbd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +kbd-install: + $(INSTALL_DIR) $(IDIR_KBD)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/loadkeys \ + $(IDIR_KBD)/usr/bin +ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) + $(INSTALL_DIR) $(IDIR_KBD)/etc + $(CP) ./files/zaurus.map $(IDIR_KBD)/etc +endif + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/kbd/files/kbd.init b/package/kbd/files/kbd.init new file mode 100644 index 000000000..3745e67d0 --- /dev/null +++ b/package/kbd/files/kbd.init @@ -0,0 +1,26 @@ +#!/bin/sh +#PKG kbd +#INIT 10 +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${kbd:-NO}" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + loadkeys /etc/${kbd_map}.map + ;; +stop) + ;; +restart) + sh $0 stop + sh $0 start + ;; +*) + echo "Usage: $0 {start | stop | restart}" + exit 1 + ;; +esac +exit $? diff --git a/package/kbd/files/kbd.postinst b/package/kbd/files/kbd.postinst new file mode 100644 index 000000000..b2d973ee1 --- /dev/null +++ b/package/kbd/files/kbd.postinst @@ -0,0 +1,4 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf kbd_map kbd_map "zaurus" +add_rcconf kbd kbd NO diff --git a/package/kbd/files/zaurus.map b/package/kbd/files/zaurus.map new file mode 100644 index 000000000..11a0e8b4d --- /dev/null +++ b/package/kbd/files/zaurus.map @@ -0,0 +1,228 @@ +# Default kernel keymap. This uses 7 modifier combinations. +keymaps 0-2,4-5,8,12 +# Change the above line into +# keymaps 0-2,4-6,8,12 +# in case you want the entries +# altgr control keycode 83 = Boot +# altgr control keycode 111 = Boot +# below. +# +keycode 1 = +keycode 2 = one exclam + control alt keycode 2 = Console_1 +keycode 3 = two quotedbl + control alt keycode 3 = Console_2 +keycode 4 = three numbersign + control alt keycode 4 = Console_3 +keycode 5 = four dollar + control alt keycode 5 = Console_4 +keycode 6 = five percent + control alt keycode 6 = Console_5 +keycode 7 = six ampersand + control alt keycode 7 = Console_6 +keycode 8 = seven apostrophe +keycode 9 = eight parenleft +keycode 10 = nine parenright +keycode 11 = zero asciitilde +keycode 12 = minus at + altgr keycode 12 = at +keycode 13 = +keycode 14 = BackSpace + altgr keycode 14 = Delete +keycode 15 = Tab + altgr keycode 15 = Caps_Lock +keycode 16 = q +keycode 17 = w + altgr keycode 17 = asciicircum +keycode 18 = e + altgr keycode 18 = equal +keycode 19 = r + altgr keycode 19 = plus +keycode 20 = t + altgr keycode 20 = bracketleft +keycode 21 = y + altgr keycode 21 = bracketright +keycode 22 = u + altgr keycode 22 = braceleft +keycode 23 = i + altgr keycode 23 = braceright +keycode 24 = o +keycode 25 = p +keycode 26 = +keycode 27 = +keycode 28 = Return +keycode 29 = Control +keycode 30 = a +keycode 31 = s +keycode 32 = d +keycode 33 = f + altgr keycode 33 = backslash +keycode 34 = g + altgr keycode 34 = semicolon +keycode 35 = h + altgr keycode 35 = colon +keycode 36 = j + altgr keycode 36 = asterisk +keycode 37 = k + altgr keycode 37 = backslash +keycode 38 = l + altgr keycode 38 = bar +keycode 39 = +keycode 40 = |