wok-next rev 13733

Add xdigger
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Dec 25 16:40:45 2012 +0100 (2012-12-25)
parents 4ca63ea76ba0
children 99837d8e7be5
files lz4/receipt syslinux/stuff/iso2exe/bootlinux.c syslinux/stuff/iso2exe/init xdigger/receipt
line diff
     1.1 --- a/lz4/receipt	Sun Dec 23 17:59:51 2012 +0000
     1.2 +++ b/lz4/receipt	Tue Dec 25 16:40:45 2012 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="lz4"
     1.7 -VERSION="74"
     1.8 +VERSION="87"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="High speed compressor."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
     2.1 --- a/syslinux/stuff/iso2exe/bootlinux.c	Sun Dec 23 17:59:51 2012 +0000
     2.2 +++ b/syslinux/stuff/iso2exe/bootlinux.c	Tue Dec 25 16:40:45 2012 +0100
     2.3 @@ -22,7 +22,9 @@
     2.4  #define SETUP_SEGMENT	0x9000
     2.5  #define CMDLINE_OFFSET	0x9E00
     2.6  
     2.7 -#define BUFFERSZ	2*1024
     2.8 +#define PAGE_BITS	12
     2.9 +#define PAGE_SIZE	4096
    2.10 +#define BUFFERSZ	PAGE_SIZE
    2.11  static char buffer[BUFFERSZ];
    2.12  static unsigned long initrd_addr, initrd_size;
    2.13  
    2.14 @@ -88,6 +90,8 @@
    2.15  #endasm
    2.16  }
    2.17  
    2.18 +#undef ZIMAGE_SUPPORT	/* Does not work... */
    2.19 +
    2.20  static int versiondos;
    2.21  static int dosversion(void)
    2.22  {
    2.23 @@ -111,7 +115,7 @@
    2.24  			printf("DOS %d not supported.\nTrying anyway...\n",
    2.25  				versiondos);
    2.26  		}
    2.27 -		p->align = 4096;
    2.28 +		p->align = PAGE_SIZE;
    2.29  		break;
    2.30  	case 4096: // first initrd
    2.31  		initrd_addr = p->base;
    2.32 @@ -169,8 +173,35 @@
    2.33  #define HDRS	0x53726448
    2.34  			if (* (unsigned long *) (buffer + HEADER) != HDRS)
    2.35  				version = 0;
    2.36 +			if (version < 0x204)
    2.37 +				syssize &= 0x000FFFFFUL;
    2.38 +			if (version) {
    2.39 +#ifdef REALMODE_SWITCH
    2.40 +				extern int far_realmode_switch();
    2.41 +#asm
    2.42 +				jmp	end_realmode_switch
    2.43 +_far_realmode_switch:
    2.44 +				call	_realmode_switch
    2.45 +				cli
    2.46 +				mov	al, #0x80	// Disable NMI
    2.47 +				out	0x70, al
    2.48 +				retf
    2.49 +end_realmode_switch:
    2.50 +#endasm
    2.51 +				* (unsigned short *) (buffer + RMSWOFS) = 
    2.52 +					far_realmode_switch;
    2.53 +				* (unsigned short *) (buffer + RMSWSEG) = 
    2.54 +					getcs();
    2.55 +#endif
    2.56 +				kernelmem.base =
    2.57 +					* (unsigned long *) (buffer + SYSTEMCODE);
    2.58 +				* (unsigned short *) (buffer + HEAPPTR) = 
    2.59 +					0x9B00;
    2.60 +				// buffer[LOADFLAGS] |= 0x80;
    2.61 +				* (unsigned short *) (buffer + LOADERTYPE) |= 
    2.62 +					0x80FF;
    2.63 +			}
    2.64  			if (!version || !(buffer[LOADFLAGS] & 1)) {
    2.65 -#undef ZIMAGE_SUPPORT	/* Does not work... */
    2.66  #ifdef ZIMAGE_SUPPORT
    2.67  #asm
    2.68  		pusha
    2.69 @@ -199,21 +230,6 @@
    2.70  #endif
    2.71  				die("Not a bzImage format");
    2.72  			}
    2.73 -			if (version < 0x204)
    2.74 -				syssize &= 0x000FFFFFUL;
    2.75 -			if (version) {
    2.76 -#ifdef REALMODE_SWITCH
    2.77 -				* (unsigned short *) (buffer + RMSWOFS) = 
    2.78 -					realmode_switch;
    2.79 -				* (unsigned short *) (buffer + RMSWSEG) = 
    2.80 -					getcs();
    2.81 -#endif
    2.82 -				* (unsigned short *) (buffer + HEAPPTR) = 
    2.83 -					0x9B00;
    2.84 -				// buffer[LOADFLAGS] |= 0x80;
    2.85 -				* (unsigned short *) (buffer + LOADERTYPE) |= 
    2.86 -					0x80FF;
    2.87 -			}
    2.88  		}
    2.89  		movesetup();
    2.90  		setup -= n;
     3.1 --- a/syslinux/stuff/iso2exe/init	Sun Dec 23 17:59:51 2012 +0000
     3.2 +++ b/syslinux/stuff/iso2exe/init	Tue Dec 25 16:40:45 2012 +0100
     3.3 @@ -330,13 +330,13 @@
     3.4  	exec 3>&1
     3.5  	format=`$DIALOG  --clear \
     3.6  	--title " Select the filesystem " \
     3.7 -	--menu "\nPlease select the filesystem type to create.\n\n\
     3.8 +	--radiolist "\nPlease select the filesystem type to create.\n\n\
     3.9  The filesystem creation will erase all the data \
    3.10  in the USB key." 14 70 4 \
    3.11 -		"none"	"Do not erase the USB key" \
    3.12 -		"ext3"	"Ext3 journaling filesystem" \
    3.13 -		"ext2"	"Ext2 filesystem" \
    3.14 -		"fat32"	"Windows FAT32 filesystem" \
    3.15 +		"none"	"Do not erase the USB key" on \
    3.16 +		"ext3"	"Ext3 journaling filesystem" off \
    3.17 +		"ext2"	"Ext2 filesystem" off \
    3.18 +		"fat32"	"Windows FAT32 filesystem" off \
    3.19  	2>&1 1>&3`
    3.20  	retval=$?
    3.21  	exec 3>&-
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/xdigger/receipt	Tue Dec 25 16:40:45 2012 +0100
     4.3 @@ -0,0 +1,30 @@
     4.4 +# SliTaz package receipt.
     4.5 +
     4.6 +PACKAGE="xdigger"
     4.7 +VERSION="1.0.10"
     4.8 +CATEGORY="games"
     4.9 +SHORT_DESC="Digger rewritten for X11."
    4.10 +MAINTAINER="pascal.bellard@slitaz.org"
    4.11 +WEB_SITE="http://www.ibiblio.org/pub/Linux/games/arcade/xdigger.lsm"
    4.12 +TARBALL="$PACKAGE-$VERSION.tgz"
    4.13 +WGET_URL="$(dirname $WEB_SITE)/$TARBALL"
    4.14 +
    4.15 +DEPENDS="xorg"
    4.16 +BUILD_DEPENDS="xorg-imake xorg-dev"
    4.17 +
    4.18 +# Rules to configure and make the package.
    4.19 +compile_rules()
    4.20 +{
    4.21 +	cd $src
    4.22 +	sed -i 's| inpause) step = Tr.*|&\nwait_count = 0;|' runlevels.c
    4.23 +	xmkmf
    4.24 +	make && make DESTDIR=$DESTDIR install
    4.25 +}
    4.26 +
    4.27 +# Rules to gen a SliTaz package suitable for Tazpkg.
    4.28 +genpkg_rules()
    4.29 +{
    4.30 +	mkdir -p $fs/usr/bin
    4.31 +	cp -a $install/usr/lib $fs/usr
    4.32 +	cp -a $install/usr/bin/X11/xdigger $fs/usr/bin
    4.33 +}