Merge branch 'master' of git+ssh://openadk.org/git/openadk

mk/modules.mk

@@ -62,6 +62,9 @@ $(eval $(call KMOD_template,R8169,r8169,\
 # 
 # Wireless network devices
 #
+$(eval $(call KMOD_template,RFKILL,rfkill,\
+	$(MODULES_DIR)/kernel/net/rfkill/rfkill \
+,10))
 
 $(eval $(call KMOD_template,MAC80211,mac80211,\
 	$(MODULES_DIR)/kernel/net/wireless/cfg80211 \

package/binutils/Makefile

@@ -21,9 +21,13 @@ $(eval $(call PKG_template,LIBBFD,libbfd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_CFLAGS+=		-fPIC
+ifeq ($(ADK_NATIVE),)
 CONFIGURE_ARGS+=	--disable-werror \
 			--host=$(REAL_GNU_TARGET_NAME) \
 			--target=$(REAL_GNU_TARGET_NAME)
+else
+CONFIGURE_ARGS+=	--disable-werror
+endif
 
 pre-build:
 	@-rm $(STAGING_TARGET_DIR)/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a

package/busybox/config/archival/Config.in

@@ -227,7 +227,6 @@ config BUSYBOX_RPM
 
 config BUSYBOX_TAR
 	bool "tar"
-	depends on !ADK_PACKAGE_TAR
 	default y
 	help
 	  tar is an archiving program. It's commonly used with gzip to

package/ccid/patches/patch-configure

@@ -0,0 +1,21 @@
+--- ccid-1.4.4.orig/configure	2011-05-13 11:19:09.000000000 +0200
++++ ccid-1.4.4/configure	2011-07-28 10:54:49.000000000 +0200
+@@ -12207,17 +12207,8 @@ done
+ # Select OS specific versions of source files.
+ 
+ 
+-BUNDLE_HOST=`uname | sed -e s,/,_,`
++BUNDLE_HOST=Linux
+ DYN_LIB_EXT="so"
+-case "$BUNDLE_HOST" in
+-Darwin)
+-	BUNDLE_HOST=MacOS
+-	DYN_LIB_EXT="dylib"
+-	;;
+-SunOS)
+-	BUNDLE_HOST=Solaris
+-	;;
+-	esac
+ 
+ # --disable-libusb
+ # Check whether --enable-libusb was given.

package/cfgfs/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cfgfs
 PKG_VERSION:=		1.0.8
-PKG_RELEASE:=		6
+PKG_RELEASE:=		7
 PKG_DESCR:=		compressed config filesystem
 PKG_SECTION:=		base
 PKG_URL:=		http://openadk.org/

package/cfgfs/src/fwcf.sh

@@ -130,9 +130,13 @@ rootdisk=${rootdisk%p*}
 rootdisk=${rootdisk%[1-9]}
 part=$(fdisk -l /dev/$rootdisk 2>/dev/null|awk '$5 == 88 { print $1 }')
 if [ -z $part ]; then
-	# otherwise search for MTD device with name cfgfs
-	part=/dev/mtd$(fgrep '"cfgfs"' /proc/mtd 2>/dev/null | sed 's/^mtd\([^:]*\):.*$/\1/')ro
-	mtd=1
+	# fallback to /dev/sda in case of encrypted root
+	part=$(fdisk -l /dev/sda 2>/dev/null|awk '$5 == 88 { print $1 }')
+	if [ -z $part ]; then
+		# otherwise search for MTD device with name cfgfs
+		part=/dev/mtd$(fgrep '"cfgfs"' /proc/mtd 2>/dev/null | sed 's/^mtd\([^:]*\):.*$/\1/')ro
+		mtd=1
+	fi
 fi
 
 if [[ ! -e $part ]]; then

package/cryptinit/Makefile

@@ -8,13 +8,16 @@ PKG_VERSION:=		2.0
 PKG_RELEASE:=		1
 PKG_DESCR:=		init for encrypted rootfilesystem
 PKG_SECTION:=		base
-PKG_DEPENDS:=		cryptsetup opensc pcsc-lite
+PKG_DEPENDS:=		cryptsetup
 
 PKG_CFLINE_CRYPTINIT:=	select BUSYBOX_STTY@
 PKG_CFLINE_CRYPTINIT+=	select BUSYBOX_SWITCH_ROOT@
 
-PKG_FLAVOURS_CRYPTINIT:=NO_GRUB
+PKG_FLAVOURS_CRYPTINIT:=SC NO_GRUB
 PKGFD_NO_GRUB:=		predefine root/swap partition (without grub)
+PKGFD_SC:=		with smartcard support
+PKGFS_SC:=		ccid openct opensc pcsc-lite
+PKGFB_SC:=		ccid openct opensc pcsc-lite
 
 PKG_FLAVOURS_STRING_CRYPTINIT:=	ROOT SWAP
 PKGFD_ROOT:=		root partition
@@ -39,6 +42,10 @@ do-install:
 	$(INSTALL_DIR) $(IDIR_CRYPTINIT)/sbin
 	$(TARGET_CC) $(TARGET_CFLAGS) -Wall -o $(IDIR_CRYPTINIT)/sbin/p \
 		./src/p.c
+ifeq ($(ADK_PACKAGE_CRYPTINIT_SC),y)
+	$(INSTALL_BIN) ./src/cryptinitsc $(IDIR_CRYPTINIT)/cryptinit
+else
 	$(INSTALL_BIN) ./src/cryptinit $(IDIR_CRYPTINIT)/
+endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/cryptinit/src/cryptinitsc

@@ -0,0 +1,65 @@
+#!/bin/sh
+
+load_modules() {
+	(sed "s,^[^#][^[:space:]]*,insmod /lib/modules/$(uname -r)/&.ko," $* | sh 2>&- || :)
+}
+
+echo -n "Kernel currently running: "
+uname -rsmo
+echo -n "Kernel parameters: "; cat /proc/cmdline
+for word in $(cat /proc/cmdline) ; do
+    case $word in
+         [a-z]*=*)
+             eval "export $word"
+             ;;
+    esac
+done
+
+echo 0 > /proc/sys/kernel/printk
+
+load_modules /etc/modules
+for f in /etc/modules.d/*; do
+	[[ -e $f ]] && load_modules /etc/modules.d/*
+	break
+done
+
+mount /dev/sda1 /boot
+mkdir -p /var/run/openct
+openct-control init
+pcscd -f >/dev/null &
+sleep 2
+
+fail=0
+count=0
+while true; do
+	pkcs15-crypt --decipher --input /boot/key  --pkcs1 --raw >/tmp/skey
+	cryptsetup -d /tmp/skey --batch-mode luksOpen $swap swapcrypt
+	if [ $? = 0 ];then
+		break
+	fi
+	if [ $count = 2 ];then
+		echo "You are not allowed"
+		sleep 3
+		fail=1
+		break
+	fi
+	count=$(($count+1))
+done
+
+if [ $fail -eq 1 ];then
+	echo "Poweroff."
+	p
+fi
+
+echo "Try to resume from hibernation"
+echo "254:0" > /sys/power/resume
+
+cryptsetup -d /tmp/skey --batch-mode luksOpen $root rootcrypt
+swapon /dev/mapper/swapcrypt
+mount /dev/mapper/rootcrypt /mnt
+pkill pcscd
+rm /tmp/skey
+umount /proc
+umount /sys
+umount /dev/pts
+umount /tmp

package/cups/patches/patch-configure

@@ -1,5 +1,5 @@
 --- cups-1.4.4.orig/configure	2010-06-17 20:25:47.000000000 +0200
-+++ cups-1.4.4/configure	2010-10-03 01:12:27.000000000 +0200
++++ cups-1.4.4/configure	2011-07-29 16:46:45.000000000 +0200
 @@ -1966,7 +1966,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -29,3 +29,12 @@
  fi
  
  if test x$enable_debug_printfs = xyes; then
+@@ -11199,7 +11199,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  PIEFLAGS="-pie -fPIE"
++  PIEFLAGS=""
+ 		{ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ else

package/firefox/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
-PKG_VERSION:=		4.0
+PKG_VERSION:=		5.0.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3468a2c463b4fc2788ba621e4b511c30
+PKG_MD5SUM:=		6d1f43e402cec84459a3d7f950bd5192
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk libpng libtiff
@@ -19,25 +19,18 @@ PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_
 PKG_NOPARALLEL:=	1
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	x86 x86_64 mips64 mips64el native
+PKG_ARCH_DEPENDS:=	x86 x86_64 mips native
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
-WRKDIST=		${WRKDIR}/mozilla-2.0
+WRKDIST=		${WRKDIR}/mozilla-release
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
-CONFIGURE_ARGS+=	--disable-ipc
-else ifeq (${ADK_TARGET_LIB_UCLIBC},y)
-CONFIGURE_ARGS+=	--disable-ipc
-else
-CONFIGURE_ARGS+=	--enable-ipc
-endif
-
-TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib
+# disable honour cflags stuff
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
 CONFIGURE_ENV+=		CROSS_COMPILE=1 \
 			HOST_CC="${CC_FOR_BUILD}" \
@@ -84,7 +77,8 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-svg \
 			--disable-mathml \
 			--disable-jemalloc \
-			--disable-crashreporter
+			--disable-crashreporter \
+			--disable-elf-hack
 
 XAKE_FLAGS+=		OS_RELEASE="2.6" HOST_CC=$(CC_FOR_BUILD) HOST_LDFLAGS=$(LDFLAGS_FOR_BUILD)
 XAKE_FLAGS+=            ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"

package/firefox/patches/patch-configure

@@ -1,6 +1,6 @@
---- mozilla-2.0.orig/configure	2011-03-19 00:48:56.000000000 +0100
-+++ mozilla-2.0/configure	2011-04-24 06:37:26.000000000 +0200
-@@ -23503,6 +23503,9 @@ fi
+--- mozilla-release.orig/configure	2011-07-08 03:30:27.000000000 +0200
++++ mozilla-release/configure	2011-07-29 15:50:35.000000000 +0200
+@@ -23504,6 +23504,9 @@ fi
      fi
  fi
  
@@ -9,4 +9,4 @@
 +
  if test -n "$CROSS_COMPILE"; then
      case "$target" in
-     *-mingw*|*-cygwin*|*-msvc*|*-mks*)
+     *-mingw*)

package/firefox/patches/patch-content_base_public_nsContentUtils_h

@@ -1,6 +1,6 @@
---- mozilla-2.0.orig/content/base/public/nsContentUtils.h	2011-03-19 00:33:33.000000000 +0100
-+++ mozilla-2.0/content/base/public/nsContentUtils.h	2011-06-15 20:05:44.538202220 +0200
-@@ -1942,7 +1942,7 @@ inline NS_HIDDEN_(PRBool) NS_FloatIsFini
+--- mozilla-release.orig/content/base/public/nsContentUtils.h	2011-07-08 03:15:15.000000000 +0200
++++ mozilla-release/content/base/public/nsContentUtils.h	2011-07-29 15:50:34.000000000 +0200
+@@ -1928,7 +1928,7 @@ inline NS_HIDDEN_(PRBool) NS_FloatIsFini
  #ifdef WIN32
    return _finite(f);
  #else

package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp

@@ -1,11 +0,0 @@
---- mozilla-2.0.orig/content/canvas/src/nsCanvasRenderingContext2D.cpp	2011-03-19 00:33:34.000000000 +0100
-+++ mozilla-2.0/content/canvas/src/nsCanvasRenderingContext2D.cpp	2011-06-15 20:26:00.226952311 +0200
-@@ -159,7 +159,7 @@ DoubleIsFinite(double d)
-     // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
-     return !!_finite(d);
- #else
--    return finite(d);
-+    return isfinite(d);
- #endif
- }
- 

package/firefox/patches/patch-content_media_nsAudioStream_cpp

@@ -1,6 +1,6 @@
---- mozilla-2.0.orig/content/media/nsAudioStream.cpp	2011-03-19 00:33:34.000000000 +0100
-+++ mozilla-2.0/content/media/nsAudioStream.cpp	2011-04-23 23:18:01.000000000 +0200
-@@ -570,7 +570,7 @@ PRInt64 nsAudioStreamLocal::GetSampleOff
+--- mozilla-release.orig/content/media/nsAudioStream.cpp	2011-07-08 03:15:16.000000000 +0200
++++ mozilla-release/content/media/nsAudioStream.cpp	2011-07-29 15:50:34.000000000 +0200
+@@ -566,7 +566,7 @@ PRInt64 nsAudioStreamLocal::GetSampleOff
  #if defined(XP_WIN)
    positionType = SA_POSITION_WRITE_HARDWARE;
  #endif

package/firefox/patches/patch-ipc_chromium_src_base_process_util_h

@@ -0,0 +1,21 @@
+--- mozilla-release.orig/ipc/chromium/src/base/process_util.h	2011-07-08 03:15:22.000000000 +0200
++++ mozilla-release/ipc/chromium/src/base/process_util.h	2011-07-29 16:26:23.000000000 +0200
+@@ -62,7 +62,8 @@ enum ProcessArchitecture {
+   PROCESS_ARCH_I386 = 0x1,
+   PROCESS_ARCH_X86_64 = 0x2,
+   PROCESS_ARCH_PPC = 0x4,
+-  PROCESS_ARCH_ARM = 0x8
++  PROCESS_ARCH_ARM = 0x8,
++  PROCESS_ARCH_MIPS = 0xf
+ };
+ 
+ static ProcessArchitecture GetCurrentProcessArchitecture()
+@@ -76,6 +77,8 @@ static ProcessArchitecture GetCurrentPro
+   currentArchitecture = base::PROCESS_ARCH_PPC;
+ #elif defined(ARCH_CPU_ARMEL)
+   currentArchitecture = base::PROCESS_ARCH_ARM;
++#elif defined(ARCH_CPU_MIPS)
++  currentArchitecture = base::PROCESS_ARCH_MIPS;
+ #endif
+   return currentArchitecture;
+ }

package/firefox/patches/patch-ipc_chromium_src_build_build_config_h

@@ -0,0 +1,15 @@
+--- mozilla-release.orig/ipc/chromium/src/build/build_config.h	2011-07-08 03:15:22.000000000 +0200
++++ mozilla-release/ipc/chromium/src/build/build_config.h	2011-07-29 16:23:31.000000000 +0200
+@@ -60,6 +60,12 @@
+ #elif defined(__ppc__)
+ #define ARCH_CPU_PPC 1
+ #define ARCH_CPU_32_BITS 1
++#elif defined(__mips__)
++#define ARCH_CPU_MIPS 1
++#define ARCH_CPU_32_BITS 1
++#elif defined(__mips64__)
++#define ARCH_CPU_MIPS 1
++#define ARCH_CPU_64_BITS 1
+ #else
+ #error Please add support for your architecture in build/build_config.h
+ #endif

package/firefox/patches/patch-js_src_Makefile_in

@@ -1,6 +1,6 @@
---- mozilla-2.0.orig/js/src/Makefile.in	2011-03-19 00:33:47.000000000 +0100
-+++ mozilla-2.0/js/src/Makefile.in	2011-04-24 19:54:11.707672834 +0200
-@@ -375,7 +375,7 @@ CPPSRCS += 	checks.cc \
+--- mozilla-release.orig/js/src/Makefile.in	2011-07-08 03:15:23.000000000 +0200
++++ mozilla-release/js/src/Makefile.in	2011-07-29 15:50:36.000000000 +0200
+@@ -391,7 +391,7 @@ CPPSRCS += 	checks.cc \
  # END enclude sources for V8 dtoa
  #############################################
  

package/libxslt/Makefile

@@ -42,7 +42,7 @@ xsltproc-install:
 
 libxslt-install:
 	${INSTALL_DIR} ${IDIR_LIBXSLT}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libxslt.so* ${IDIR_LIBXSLT}/usr/lib
+	${CP} ${WRKINST}/usr/lib/lib?xslt.so* ${IDIR_LIBXSLT}/usr/lib
 
 libxslt-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBXSLT_DEV}/usr/include

package/openct/Makefile

@@ -37,6 +37,8 @@ post-install:
 		${IDIR_OPENCT}/usr/bin
 	${INSTALL_DATA} ${WRKBUILD}/etc/openct.conf \
 		${IDIR_OPENCT}/etc
+
+libopenct-install:
 	${INSTALL_DIR} ${IDIR_LIBOPENCT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libopenct.so* \
 		${IDIR_LIBOPENCT}/usr/lib

package/opensc/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		opensc
 PKG_VERSION:=		0.11.13
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		98fa151e947941f9c3f27420fdf47c11
 PKG_DESCR:=		utilities to access smart cards
 PKG_SECTION:=		crypto
@@ -46,6 +46,10 @@ post-install:
 		 ${IDIR_OPENSC}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/pkcs15-tool \
 		 ${IDIR_OPENSC}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/pkcs15-crypt \
+		 ${IDIR_OPENSC}/usr/bin
+
+libopensc-install:
 	${INSTALL_DIR} ${IDIR_LIBOPENSC}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libopensc.so* \
 		${IDIR_LIBOPENSC}/usr/lib

package/xorg-server/Makefile

@@ -105,7 +105,7 @@ xorg-server-install:
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia
 ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
 	${CP} ./files/xorg.conf.lemote-yeelong \
-		$(IDIR_XORG_SERVER)/etc/X11
+		$(IDIR_XORG_SERVER)/etc/X11/xorg.conf
 endif
 ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
 	${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*dri*.so \

target/Makefile

@@ -65,7 +65,7 @@ ifneq ($(ADK_TARGET_CMDLINE),)
 	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${ADK_TARGET_CMDLINE}"#' \
 		${BUILD_DIR}/.kernelconfig.board
 endif
-ifneq ($(ADK_PACKAGE_CMDLINE),)
+ifneq ($(ADK_PACKAGE_CRYPTINIT_ROOT),)
 	@sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${ADK_PACKAGE_CMDLINE}"#' \
 		${BUILD_DIR}/.kernelconfig.board
 endif

target/linux/config/Config.in.misc

@@ -1,6 +1,3 @@
-config ADK_KERNEL_RFKILL
- 	boolean
-
 config ADK_KERNEL_I2C
  	boolean
  

target/linux/config/Config.in.netdevice

@@ -249,10 +249,14 @@ config ADK_KERNEL_WIRELESS
 config ADK_KERNEL_WIRELESS_EXT
 	boolean
 
+config ADK_KPACKAGE_KMOD_RFKILL
+	tristate
+	
 config ADK_KERNEL_MAC80211_LEDS
 	boolean
 	select ADK_KPACKAGE_KMOD_LEDS_CLASS
 	select ADK_KERNEL_NEW_LEDS
+	select ADK_KERNEL_LEDS_TRIGGERS
 
 config ADK_KERNEL_WLAN_80211
 	boolean
@@ -293,7 +297,6 @@ config ADK_KERNEL_MAC80211_DEBUGFS
 
 config ADK_KPACKAGE_KMOD_MAC80211
 	tristate
-	select ADK_KERNEL_RFKILL
 	select ADK_KERNEL_WIRELESS
 	select ADK_KERNEL_WLAN_80211
 	select ADK_KERNEL_MOD_CFG80211
@@ -301,6 +304,7 @@ config ADK_KPACKAGE_KMOD_MAC80211
 	select ADK_KPACKAGE_KMOD_CRYPTO_AES
 	select ADK_KPACKAGE_KMOD_CRYPTO_ECB
 	select ADK_KPACKAGE_KMOD_CRYPTO_ARC4
+	select ADK_KPACKAGE_KMOD_RFKILL
 
 config ADK_DEBUG_MAC80211
 	boolean

target/linux/config/Config.in.usb

@@ -200,7 +200,7 @@ config ADK_KPACKAGE_KMOD_USB_PEGASUS
 config ADK_KPACKAGE_KMOD_USB_HSO
 	prompt "kmod-usb-hso...................... Support for USB HSO devices"
 	tristate
-	select ADK_KERNEL_RFKILL
+	select ADK_KPACKAGE_KMOD_RFKILL
 	select ADK_KPACKAGE_KMOD_USB_STORAGE
 	default n
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER