diff options
97 files changed, 151223 insertions, 22822 deletions
@@ -1,9 +1,4 @@ -- php update -- openssh update +- add support for brcm 2.6 - macos x build -- test on OpenSuSE -- test on Fedora Core - help text for config/ needs adoption - fix watchdog for alix1c (mfgpt timers problem) -- implement rpm package backend -- implement dpkg package backend diff --git a/mk/build.mk b/mk/build.mk index cc6c447ff..f6f764c87 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -13,9 +13,11 @@ CONFIG = config DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_DEBUG=n \ ADK_STATIC=n \ - ADK_MAKE_PARALLEL=n \ + ADK_MAKE_PARALLEL=y \ + ADK_MAKE_JOBS=4 \ ADK_FORCE_PARALLEL=n \ ADK_PACKAGE_GRUB=n \ + ADK_PACKAGE_XORG_SERVER_WITH_DRI=n \ ADK_PACKAGE_AUFS2_UTIL=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_GCC=n \ diff --git a/mk/modules.mk b/mk/modules.mk index fce15c190..a7fc49d8c 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1047,18 +1047,18 @@ $(eval $(call KMOD_template,PCCARD,pccard,\ $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core \ ,40)) -$(eval $(call KMOD_template,PCMCIA,pcmcia,\ - $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia \ -,50)) - -$(eval $(call KMOD_template,CARDBUS,cardbus,\ +$(eval $(call KMOD_template,YENTA,yenta,\ $(MODULES_DIR)/kernel/drivers/pcmcia/rsrc_nonstatic \ $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket \ ,50)) -$(eval $(call KMOD_template,PCMCIA_SERIAL_CS,pcmcia-serial-cs,\ +$(eval $(call KMOD_template,PCMCIA,pcmcia,\ + $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia \ +,60)) + +$(eval $(call KMOD_template,SERIAL_8250_CS,serial-8250-cs,\ $(MODULES_DIR)/kernel/drivers/serial/serial_cs \ -,55)) +,70)) # # Input diff --git a/mk/rootfs.mk b/mk/rootfs.mk index b91a58629..cb21798a8 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -10,6 +10,11 @@ endef ifeq ($(ADK_LINUX_MIPS_RB532),y) ROOTFS:= root=/dev/sda2 +MTDDEV:= root=/dev/mtdblock1 +endif + +ifeq ($(ADK_LINUX_MIPS_RB433),y) +MTDDEV:= root=/dev/mtdblock2 endif ifeq ($(ADK_LINUX_ARM_FOXBOARD),y) @@ -17,12 +22,12 @@ ROOTFS:= root=/dev/mmcblk0p2 rootwait endif $(eval $(call rootfs_template,ext2-block,EXT2_BLOCK,$(ROOTFS))) -$(eval $(call rootfs_template,usb,USB,root=/dev/sdb1 rootdelay=10)) +$(eval $(call rootfs_template,usb,USB,root=/dev/sdb1 rootdelay=5)) $(eval $(call rootfs_template,archive,ARCHIVE)) $(eval $(call rootfs_template,initramfs,INITRAMFS)) $(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK)) $(eval $(call rootfs_template,squashfs,SQUASHFS)) -$(eval $(call rootfs_template,yaffs,YAFFS,root=/dev/mtdblock1 panic=3)) +$(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3)) $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init)) $(eval $(call rootfs_template,encrypted,ENCRYPTED)) diff --git a/package/Config.in b/package/Config.in index 5f1a0bdd4..265e222fd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -56,6 +56,7 @@ source "package/xz/Config.in" endmenu menu "Cryptography" +source "package/ccid/Config.in" source "package/cryptsetup/Config.in" source "package/gnupg/Config.in" source "package/gnutls/Config.in" @@ -65,6 +66,7 @@ source "package/openct/Config.in" source "package/opensc/Config.in" source "package/openssl/Config.in" source "package/openssl-pkcs11/Config.in" +source "package/pcsc-lite/Config.in" source "package/rng-tools/Config.in" endmenu @@ -579,9 +581,11 @@ source "package/hdparm/Config.in" source "package/usbutils/Config.in" source "package/patch/Config.in" source "package/pciutils/Config.in" +source "package/pcmciautils/Config.in" source "package/procps/Config.in" source "package/sispmctl/Config.in" source "package/stress/Config.in" +source "package/sysfsutils/Config.in" source "package/sysstat/Config.in" source "package/swconfig/Config.in" source "package/udev/Config.in" diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 41506092d..d5ce04b77 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -9,14 +9,15 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 62e8e47cbd63741b4bbe634dcdc8a56a PKG_DESCR:= MESA library PKG_SECTION:= libs -PKG_DEPENDS:= libxdamage libxfixes -PKG_BUILDDEP+= libXdamage libXfixes libXxf86vm -PKG_URL:= add project url +PKG_DEPENDS:= libxdamage libxfixes libdrm +PKG_BUILDDEP+= libXdamage libXfixes libXxf86vm libdrm +PKG_BUILDDEP+= dri2proto glproto expat +PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.1/ WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} -PKG_TARGET_DEPENDS:= x86 x86_64 +PKG_TARGET_DEPENDS:= ibmx40 include $(TOPDIR)/mk/package.mk @@ -24,10 +25,27 @@ $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D CONFIGURE_ARGS+= --disable-static \ --disable-gallium \ + --disable-glw \ + --with-driver=dri \ --without-demos XAKE_FLAGS+= APP_CC=${HOSTCC} HOST_CC=${HOSTCC} +pre-configure: + (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ + ./configure \ + --disable-static \ + --disable-glw \ + --disable-gallium \ + --with-driver=xlib \ + --without-demos \ + ); + ${MAKE} -C ${WRKBUILD}/src/glsl + ${MAKE} -C ${WRKBUILD}/src/glsl/apps + cp ${WRKBUILD}/src/glsl/apps/compile \ + ${STAGING_TOOLS}/bin + ${MAKE} -C ${WRKBUILD}/src/glsl clean + post-install: $(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib $(INSTALL_BIN) $(WRKINST)/usr/lib/libGL*.so* \ diff --git a/package/MesaLib/patches/patch-src_glsl_Makefile b/package/MesaLib/patches/patch-src_glsl_Makefile new file mode 100644 index 000000000..baa023db4 --- /dev/null +++ b/package/MesaLib/patches/patch-src_glsl_Makefile @@ -0,0 +1,11 @@ +--- Mesa-7.8.1.orig/src/glsl/Makefile 2010-04-05 01:46:26.000000000 +0200 ++++ Mesa-7.8.1/src/glsl/Makefile 2010-05-21 17:17:54.621613561 +0200 +@@ -4,7 +4,7 @@ TOP = ../.. + + include $(TOP)/configs/current + +-SUBDIRS = pp cl apps ++SUBDIRS = pp cl + + default install clean: + @for dir in $(SUBDIRS) ; do \ diff --git a/package/MesaLib/patches/patch-src_glsl_Makefile_template b/package/MesaLib/patches/patch-src_glsl_Makefile_template deleted file mode 100644 index bcb3256d6..000000000 --- a/package/MesaLib/patches/patch-src_glsl_Makefile_template +++ /dev/null @@ -1,11 +0,0 @@ ---- Mesa-7.8.1.orig/src/glsl/Makefile.template 2010-04-05 01:46:26.000000000 +0200 -+++ Mesa-7.8.1/src/glsl/Makefile.template 2010-04-19 21:18:45.000000000 +0200 -@@ -44,7 +44,7 @@ install: - ##### RULES ##### - - .c.o: -- $(CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@ -+ $(HOST_CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@ - - -include depend - diff --git a/package/MesaLib/patches/patch-src_glsl_apps_Makefile b/package/MesaLib/patches/patch-src_glsl_apps_Makefile deleted file mode 100644 index 175965dc5..000000000 --- a/package/MesaLib/patches/patch-src_glsl_apps_Makefile +++ /dev/null @@ -1,15 +0,0 @@ ---- Mesa-7.8.1.orig/src/glsl/apps/Makefile 2010-04-05 01:46:26.000000000 +0200 -+++ Mesa-7.8.1/src/glsl/apps/Makefile 2010-04-19 21:20:55.000000000 +0200 -@@ -26,10 +26,10 @@ INCLUDES = -I. - .SUFFIXES: .c - - .c: -- $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@ -+ $(APP_CC) $(HOSTCFLAGS) $< $(LIBS) -o $@ - - .c.o: -- $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ -+ $(APP_CC) -c $(HOSTCFLAGS) $(DEFINES) $< -o $@ - - - ##### TARGETS ##### diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile index 5a1823cc3..e758b1f2f 100644 --- a/package/adkinstall/Makefile +++ b/package/adkinstall/Makefile @@ -10,7 +10,7 @@ PKG_DESCR:= installer for cf, mmc, sd or mtd devices PKG_SECTION:= base PKG_DEPENDS:= parted sfdisk e2fsprogs -PKG_TARGET_DEPENDS:= alix wrap rb532 foxg20 +PKG_TARGET_DEPENDS:= alix wrap routerboard foxg20 WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 @@ -34,6 +34,12 @@ ifeq ($(ADK_LINUX_MIPS_RB532),y) else ifeq ($(ADK_LINUX_ARM_FOXBOARD),y) ${INSTALL_BIN} ./src/adkinstall.foxg20 \ $(IDIR_ADKINSTALL)/sbin/adkinstall +else ifeq ($(ADK_LINUX_MIPS_RB433),y) + ${INSTALL_BIN} ./src/adkinstall.rb4xx \ + $(IDIR_ADKINSTALL)/sbin/adkinstall +else ifeq ($(ADK_LINUX_MIPS_RB411),y) + ${INSTALL_BIN} ./src/adkinstall.rb4xx \ + $(IDIR_ADKINSTALL)/sbin/adkinstall else ${INSTALL_BIN} ./src/adkinstall $(IDIR_ADKINSTALL)/sbin endif diff --git a/package/adkinstall/src/adkinstall.rb4xx b/package/adkinstall/src/adkinstall.rb4xx new file mode 100644 index 000000000..f96cc7f05 --- /dev/null +++ b/package/adkinstall/src/adkinstall.rb4xx @@ -0,0 +1,36 @@ +#!/bin/sh +# installs a rootfs tar archive from OpenADK onto +# a NAND device +# special script for routerboard rb4xx + +if [ -z $1 ];then + printf "Please give your root tar archive as parameter\n" + exit 1 +fi + +printf "Preparing mountpoints\n" +mount -t yaffs2 /dev/mtdblock2 /mnt +rm -rf /mnt/* >/dev/null 2>&1 +mkdir /mnt/boot +mount -t yaffs2 /dev/mtdblock1 /mnt/boot + +printf "Extracting install archive\n" +tar -C /mnt -xzpf $1 +if [ $? -ne 0 ];then + printf "Extracting of install archive failed" + exit 1 +fi + +chmod 1777 /mnt/tmp +chmod 4755 /mnt/bin/busybox + +sync +umount /mnt/boot +umount /mnt +if [ $? -ne 0 ];then + printf "Unmounting filesystem failed" + exit 1 +else + printf "Successfully installed.\n" + exit 0 +fi diff --git a/package/base-files/src/lib/mdev/init b/package/base-files/src/lib/mdev/init index de368c80c..eec8242a1 100644 --- a/package/base-files/src/lib/mdev/init +++ b/package/base-files/src/lib/mdev/init @@ -14,3 +14,9 @@ if [ "$SUBSYSTEM" == "firmware" ];then fi fi fi +if [ "$SUBSYSTEM" == "pcmcia_socket" ];then + logger "Setting up PCMCIA socket resource database" + if [ "$ACTION" == "add" ];then + /usr/sbin/pcmcia-socket-startup + fi +fi diff --git a/package/base-files/src/sbin/adkupdate b/package/base-files/src/sbin/adkupdate index 1af188b41.. |