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

package/Config.in

@@ -71,6 +71,7 @@ source "package/vilistextum/Config.in"
 endmenu
 
 menu "Misc"
+source "package/bzip2/Config.in"
 source "package/collectd/Config.in"
 source "package/deco/Config.in"
 source "package/digitemp/Config.in"

package/Depends.mk

@@ -225,6 +225,7 @@ tor-compile: libevent-compile openssl-compile zlib-compile
 trafshow: ncurses-compile libpcap-compile
 usbutils-compile: libusb-compile
 ussp-push-compile: openobex-compile
+util-linux-ng-compile: e2fsprogs-compile ncurses-compile
 vilistextum-compile: libiconv-compile
 vim-compile: ncurses-compile
 vnc-reflector-compile: jpeg-compile zlib-compile

package/Makefile

@@ -33,6 +33,7 @@ package-$(ADK_COMPILE_AVAHI) += avahi
 package-$(ADK_COMPILE_AXTLS) += axtls
 package-$(ADK_PACKAGE_BASH) += bash
 package-$(ADK_COMPILE_BC) += bc
+package-$(ADK_PACKAGE_BZIP2) += bzip2
 package-$(ADK_PACKAGE_CA_CERTS) += ca-certificates
 package-$(ADK_PACKAGE_CFGFS) += cfgfs
 package-$(ADK_PACKAGE_CRYPTINIT) += cryptinit
@@ -74,6 +75,7 @@ package-$(ADK_PACKAGE_DROPBEAR) += dropbear
 package-$(ADK_PACKAGE_DSNIFF) += dsniff
 package-$(ADK_PACKAGE_E2FSPROGS) += e2fsprogs
 package-$(ADK_PACKAGE_LIBUUID) += e2fsprogs
+package-$(ADK_PACKAGE_LIBBLKID) += e2fsprogs
 package-$(ADK_PACKAGE_ELINKS) += elinks
 package-$(ADK_PACKAGE_ESOUND) += esound
 package-$(ADK_PACKAGE_ETHER_WAKE) += ether-wake

package/bzip2/Config.in

@@ -0,0 +1,6 @@
+config ADK_PACKAGE_BZIP2
+	prompt "bzip2.............................. bzip2 compression utility"
+	tristate
+	default n
+	help
+ 	  http://www.bzip.org

package/bzip2/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:=		bzip2
+PKG_VERSION:=		1.0.5
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		3c15a0c8d1d3ee1c46a1634d00617b1a
+PKG_DESCR:=		bzip2 compression utility
+PKG_SECTION:=		utils
+PKG_URL:=		http://www.bzip.org
+PKG_SITES:=		http://www.bzip.org/1.0.5/
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,BZIP2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+XAKE_FLAGS+=		PREFIX=${WRKINST}/usr
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	${INSTALL_DIR} ${IDIR_BZIP2}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/bzip2 ${IDIR_BZIP2}/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/bzip2/patches/patch-Makefile

@@ -0,0 +1,34 @@
+--- bzip2-1.0.5.orig/Makefile	2008-02-14 13:39:18.000000000 +0100
++++ bzip2-1.0.5/Makefile	2009-08-23 20:18:12.000000000 +0200
+@@ -15,16 +15,16 @@
+ SHELL=/bin/sh
+ 
+ # To assist in cross-compiling
+-CC=gcc
+-AR=ar
+-RANLIB=ranlib
+-LDFLAGS=
++CC?=gcc
++AR?=ar
++RANLIB?=ranlib
++LDFLAGS?=
+ 
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS?=-Wall -Winline -O2 -g $(BIGFILES)
+ 
+ # Where you want it installed when you do 'make install'
+-PREFIX=/usr/local
++PREFIX?=/usr
+ 
+ 
+ OBJS= blocksort.o  \
+@@ -35,7 +35,7 @@ OBJS= blocksort.o  \
+       decompress.o \
+       bzlib.o
+ 
+-all: libbz2.a bzip2 bzip2recover test
++all: libbz2.a bzip2 bzip2recover
+ 
+ bzip2: libbz2.a bzip2.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2

package/bzip2/patches/patch-Makefile.orig

@@ -0,0 +1,34 @@
+--- bzip2-1.0.5.orig/Makefile	2008-02-14 13:39:18.000000000 +0100
++++ bzip2-1.0.5/Makefile	2009-08-23 20:16:24.000000000 +0200
+@@ -15,16 +15,16 @@
+ SHELL=/bin/sh
+ 
+ # To assist in cross-compiling
+-CC=gcc
+-AR=ar
+-RANLIB=ranlib
+-LDFLAGS=
++CC?=gcc
++AR?=ar
++RANLIB?=ranlib
++LDFLAGS?=
+ 
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS?=-Wall -Winline -O2 -g $(BIGFILES)
+ 
+ # Where you want it installed when you do 'make install'
+-PREFIX=/usr/local
++PREFIX=/usr
+ 
+ 
+ OBJS= blocksort.o  \
+@@ -35,7 +35,7 @@ OBJS= blocksort.o  \
+       decompress.o \
+       bzlib.o
+ 
+-all: libbz2.a bzip2 bzip2recover test
++all: libbz2.a bzip2 bzip2recover
+ 
+ bzip2: libbz2.a bzip2.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2

package/cryptinit/src/cryptinit.c

@@ -56,8 +56,7 @@
 #define DEF_KERN_ROOT_SRC "/dev/mapper/root"
 #define DEF_KERN_ROOT_TGT "/mnt"
 #define DEF_KERN_ROOT_FS "xfs"
-#define DEF_KERN_INIT "/start"
-#define DEF_KERN_RUNLEVEL "3"
+#define DEF_KERN_INIT "/init"
 
 #ifndef MS_MOVE
 #define MS_MOVE         8192
@@ -76,7 +75,6 @@ struct commandline {
         struct mntopts root;
         char *init;
         char *resume;
-        char *runlevel;
         ushort do_resume;
         ushort debug;
 };
@@ -116,7 +114,7 @@ static void cmdLineLog(int class, char *msg) {
 	}
 }
 
-int switch_root(char *console, char *newroot, char *init, char *initarg) {
+int switch_root(char *console, char *newroot, char *init) {
 
 	if (chdir(newroot)) {
 		fprintf(stderr,"bad newroot %s\n",newroot);
@@ -203,11 +201,6 @@ int parse_cmdline(char *line) {
 		} else if(!strncmp(tmpstr, "debug", 5)) {
 			cmdline.debug=1;
 
-		} else if(strlen(tmpstr) == 1) {
-			tmpnum = (int)strtol(tmpstr, invchars, 10);
-			if(**invchars == '\0' && tmpnum >= 0) {
-				cmdline.runlevel = tmpstr;
-			}
 		} else {
 			if(cmdline.debug)
 				printf("unknown bootparam flag %s\n",tmpstr);
@@ -217,8 +210,8 @@ int parse_cmdline(char *line) {
 	debug_printf("\n Bootparams scanned:\n");
 	debug_printf("root\t%s\nrootfstype\t%s\ninit\t%s\nresume\t%s\ndo_resume\t%i\n",
 			cmdline.root.source,cmdline.root.fstype,cmdline.init,cmdline.resume,cmdline.do_resume);
-	debug_printf("debug\t%i\nrunlevel\t%s\n\n",
-			cmdline.debug,cmdline.runlevel);
+	debug_printf("debug\t%i\n\n",
+			cmdline.debug);
 	return 0;
 }
 
@@ -234,7 +227,6 @@ int get_cmdline() {
 	cmdline.resume = DEF_KERN_SWAP;
 	cmdline.do_resume = 1;
 	cmdline.debug = 0;
-	cmdline.runlevel = DEF_KERN_RUNLEVEL;
 
 	/* read out cmdline from /proc */
 	str = read_cmdline();
@@ -261,11 +253,11 @@ void kmsg_log(int level) {
 void do_resume(void) {
 	FILE *fd;
 
-	debug_msg("Running tuxonice-resume\n");
-	if((fd = fopen("/sys/power/tuxonice/do_resume", "a")) == NULL) {
+	debug_msg("Trying to resume\n");
+	if((fd = fopen("/sys/power/resume", "a")) == NULL) {
 		return;
 	}
-	fprintf(fd, "1\n");
+	fprintf(fd, "254:0\n");
 	fclose(fd);
 }
 
@@ -338,7 +330,7 @@ int main(void) {
 
 	ret = uname(&info);
 	if (ret < 0)
-		fprintf(stderr, "Error calling uname\n");
+		fprintf(stderr, "Error calling uname function\n");
 
 	/* security by obscurity */
 	printf("This is %s.%s (Linux %s %s)\n", hostname, domainname, info.machine, info.release);
@@ -413,7 +405,7 @@ int main(void) {
 	memset(pass, 0, strlen(pass)*sizeof(char));
 
 	debug_msg("Switching root\n");
-	switch_root(DEF_KERN_CONS, cmdline.root.target, cmdline.init, cmdline.runlevel);
+	switch_root(DEF_KERN_CONS, cmdline.root.target, cmdline.init);
 	
 	return(0);
 }

package/e2fsprogs/Config.in

@@ -1,9 +1,10 @@
 config ADK_PACKAGE_E2FSPROGS
-	prompt "e2fsprogs......................... Ext2/3 filesystem utilities"
+	prompt "e2fsprogs......................... Ext2/3/4 filesystem utilities"
 	tristate
 	default n
 	select ADK_PACKAGE_LIBUUID
 	select ADK_PACKAGE_LIBCOM_ERR
+	select ADK_PACKAGE_LIBBLKID
 	help
 	  This package contains essential ext2 filesystem utilities which consists of
 	  e2fsck, mke2fs, debugfs, dumpe2fs, tune2fs, and most of the other core ext2
@@ -18,6 +19,13 @@ config ADK_PACKAGE_LIBUUID
 	default n
 	help
 
+config ADK_PACKAGE_LIBBLKID
+	prompt "libblkid........................ BlockID library"
+	depends on ADK_PACKAGE_E2FSPROGS
+	tristate
+	default n
+	help
+
 config ADK_PACKAGE_LIBCOM_ERR
 	prompt "libcom_err...................... Common error library"
 	depends on ADK_PACKAGE_E2FSPROGS

package/e2fsprogs/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		e2fsprogs
-PKG_VERSION:=		1.41.5
+PKG_VERSION:=		1.41.9
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e218df6c84fc17c1126d31de9472a76c
+PKG_MD5SUM:=		52f60a9e19a02f142f5546f1b5681927
 PKG_DESCR:=		Ext2/3/4 filesystem utilities
 PKG_SECTION:=		admin
 PKG_URL:=		http://e2fsprogs.sourceforge.net
@@ -16,19 +16,22 @@ PKG_DESCR_1:=		UUID library
 PKG_SECTION_1:=		libs
 PKG_DESCR_2:=		Common error library
 PKG_SECTION_2:=		libs
+PKG_DESCR_3:=		Libblkid
+PKG_SECTION_3:=		libs
 
 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,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION_1}))
 $(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION_3}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--enable-elf-shlibs \
 			--disable-tls \
 			--enable-dynamic-e2fsck
 BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
+INSTALL_STYLE=		auto
 INSTALL_TARGET+=	install-libs
 
 pre-build:
@@ -44,8 +47,12 @@ post-install:
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSPROGS}/usr/sbin/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_E2FSPROGS}/usr/sbin/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_E2FSPROGS}/usr/sbin/
-	${CP} ${WRKINST}/usr/lib/lib{blkid,e2p,ext2fs}.so.* \
+	${CP} ${WRKINST}/usr/lib/lib{e2p,ext2fs}.so.* \
 		${IDIR_E2FSPROGS}/usr/lib/
+	# subpackage libblkid
+	${INSTALL_DIR} ${IDIR_LIBBLKID}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libblkid.so.* \
+		${IDIR_LIBBLKID}/usr/lib/
 	# subpackage libcom_err
 	${INSTALL_DIR} ${IDIR_LIBCOM_ERR}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcom_err.so.* \

package/e2fsprogs/patches/patch-misc_Makefile_in

@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- e2fsprogs-1.41.3.orig/misc/Makefile.in	2008-10-07 16:22:39.000000000 +0200
-+++ e2fsprogs-1.41.3/misc/Makefile.in	2009-01-13 14:16:03.661864854 +0100
-@@ -113,7 +113,7 @@ tune2fs.static: $(TUNE2FS_OBJS) $(STATIC
- blkid: $(BLKID_OBJS) $(DEPLIBBLKID) $(LIBEXT2FS)
- 	@echo "	LD $@"
- 	@$(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBBLKID) $(LIBINTL) \
--		$(LIBEXT2FS)
-+		$(LIBEXT2FS) $(LIBCOM_ERR)
- 
- e2image: $(E2IMAGE_OBJS) $(DEPLIBS)
- 	@echo "	LD $@"

package/util-linux-ng/Config.in

@@ -25,6 +25,7 @@ config ADK_PACKAGE_SWAP_UTILS
 	tristate
 	default n
 	select ADK_COMPILE_UTIL_LINUX_NG
+	select ADK_PACKAGE_LIBBLKID
 	help
 	  A collection of tools to manage swap space :
 	    * mkswap

package/util-linux-ng/Makefile

@@ -14,13 +14,14 @@ PKG_SITES:=		${MASTER_SITE_KERNEL:=utils/util-linux-ng/v2.15/}
 
 PKG_DESCR_1:=		Partition table manipulation utility
 PKG_DESCR_2:=		Swap space management utilities
+PKG_DEPENDS_SWAP:=	libblkid
 PKG_DESCR_3:=		Loop devices setup and control utility
 PKG_DEPENDS_3:=		kmod-loop
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
-$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION}))
+$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_SWAP},${PKG_DESCR_2},${PKG_SECTION}))
 $(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_3},${PKG_DESCR_3},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu

target/Config.in

@@ -134,6 +134,7 @@ config ADK_LINUX_MIPS64_LEMOTE
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_MII
+	select ADK_KERNEL_SWAP
 	help
 	  Lemote Subnotebook
 
@@ -314,6 +315,8 @@ prompt "Target C library"
 depends on ! ADK_NATIVE
 config ADK_TARGET_LIB_UCLIBC
 	bool "uClibc embedded C library"
+	# broken, because of 16kB pagesize
+	depends on !ADK_LINUX_MIPS64_LEMOTE
 	help
  	 http://uclibc.org
 
@@ -432,17 +435,26 @@ config ADK_TARGET_ROOTFS_ENCRYPTED
 	help
 	  Use this option if you want an encrypted rootfs.
 	  Default is XFS filesystem. Use following commands to setup 
-	  your hard disk, after booting via NFS or USB:
+	  your hard disk, after booting via NFS or USB.
+	  Create at least three partitions with fdisk
+	  /dev/sda1 (ext2)
+          /dev/sda2 (encrypted root)
+          /dev/sda3 (swap)
+
+	  mkdir /mnt/{boot,root}
 	  cryptsetup luksFormat /dev/sda2 
-	  cryptsetup luksOpen /dev/sda2 crypt
-          mkfs.xfs /dev/mapper/crypt
-          mount /dev/mapper/crypt /mnt
-          tar xzvf lemote-mips-encryptedroot.tar.gz -C /mnt
-	  umount /mnt
-          mount /dev/sda1 /mnt
-	  cp lemote-mips-kernel /mnt/ 
-	  mkdir /mnt/boot
-	  Create boot.cfg ... 
+	  cryptsetup luksOpen /dev/sda2 root
+	  cryptsetup luksFormat /dev/sda3
+	  cryptsetup luksOpen /dev/sda3 swap
+	  mkswap /dev/mapper/swap
+          mkfs.xfs /dev/mapper/root
+          mount /dev/mapper/root /mnt/root
+          tar xzvf lemote-mips-encryptedroot.tar.gz -C /mnt/root
+          mount /dev/sda1 /mnt/boot
+	  mkdir /mnt/boot/boot
+	  cp lemote-mips-kernel /mnt/boot/boot
+	  mv /mnt/root/boot/boot.cfg /mnt/boot/boot
+	  cd /mnt/root ; mknod -m 644 console c 5 1
 
 endchoice
 
@@ -486,4 +498,20 @@ config ADK_X11
 	  Try to compile other packages with X11 support. 
 	  (f.e. mplayer)
 
+config ADK_DEVELSYSTEM
+	bool "Compile a OpenADK development system"
+	default n
+	select ADK_PACKAGE_BASH
+	select ADK_PACKAGE_MAKE
+	select ADK_PACKAGE_PATCH
+	select ADK_PACKAGE_GCC
+	select ADK_PACKAGE_BINUTILS
+	select ADK_PACKAGE_TAR
+	select ADK_PACKAGE_BZIP2
+	help
+	  After bootstrapping a Linux system you might want to
+	  switch to native builds with your target. 
+	  If you choose this option, all necessary software needed
+	  for native building will be selected.
+
 endmenu

target/lemote/Makefile

@@ -42,10 +42,12 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) createinit
 	@echo '/dev/sda3 (swap)'
 	@echo 'mkdir /mnt/{boot,root}'
 	@echo 'mke2fs /dev/sda1'
-	@echo 'mkfs.xfs /dev/sda2'
 	@echo 'cryptsetup luksFormat /dev/sda2'
 	@echo 'cryptsetup luksFormat /dev/sda3'
-	@echo 'cryptsetup luksOpen /dev/sda2 crypt'
+	@echo 'cryptsetup luksOpen /dev/sda2 root'
+	@echo 'cryptsetup luksOpen /dev/sda3 swap'
+	@echo 'mkfs.xfs /dev/mapper/root'
+	@echo 'mkswap /dev/mapper/swap'
 	@echo 'mount /dev/sda1 /mnt/boot'
 	@echo 'mount /dev/mapper/crypt /mnt/root'
 	@echo 'mkdir /mnt/boot/boot'

target/lemote/kernel.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.30.5
-# Sat Aug 22 17:10:45 2009
+# Sun Aug 23 20:23:04 2009
 #
 CONFIG_MIPS=y
 
@@ -143,6 +143,10 @@ CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_STATIC=y
+
+#
+# Memory hotplug is currently incompatible with Software Suspend
+#
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_PHYS_ADDR_T_64BIT=y
@@ -310,12 +314,15 @@ CONFIG_BINFMT_ELF32=y
 #
 # Power management options
 #
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION="/dev/mapper/swap"
 
 #
 # CPU Frequency scaling