# HG changeset patch # User Pascal Bellard # Date 1590401430 0 # Node ID d33c3c211ef8b725b8c5b91233a21447991d8f25 # Parent 24235f64ae6cb37b32cc389e9a6cb7f0f4badebb syslinux/iso2exe: use isoboot diff -r 24235f64ae6c -r d33c3c211ef8 linld/receipt --- a/linld/receipt Sun May 24 16:43:25 2020 +0000 +++ b/linld/receipt Mon May 25 10:10:30 2020 +0000 @@ -46,6 +46,7 @@ grep '^Warning[ :]' */LNK.LOG */CPP.LOG grep '*Warning*' */*.LST cp LINLD$SUFFIX/LINLD.COM linld.com + cp LINLD$SUFFIX/HEADER.COM header.com cp TAZBOOT/TAZBOOT.COM tazboot.com dd count=$((0x$(sed '/ FOLD/!d;s|.*:||;s| .*||;q' LINLD$SUFFIX/ISOBOOT.MAP) - 0x100)) \ if=LINLD$SUFFIX/ISOBOOT.COM bs=1 > isoboot.com diff -r 24235f64ae6c -r d33c3c211ef8 linld/stuff/src/!COMPILE.BAT --- a/linld/stuff/src/!COMPILE.BAT Sun May 24 16:43:25 2020 +0000 +++ b/linld/stuff/src/!COMPILE.BAT Mon May 25 10:10:30 2020 +0000 @@ -15,3 +15,4 @@ tasm /la /m /dISOHOOK /dMOVE_SETUP /dUSE_ARGSTR /dNO386 /dLARGE_IMAGES /dLONG_FILENAME *.asm > asm.log tlink /m /s /t @link.cmd > lnk.log tlink /m /s /t @link2.cmd > lnk2.log +tlink /m /s /t @header.cmd > header.log diff -r 24235f64ae6c -r d33c3c211ef8 linld/stuff/src/HEADER.ASM --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/linld/stuff/src/HEADER.ASM Mon May 25 10:10:30 2020 +0000 @@ -0,0 +1,76 @@ +;*************************************************************** +;****** This file is distributed under GPL +;*************************************************************** + ideal + %PAGESIZE 1000 + %crefref + %noincl + %nomacs + p8086 + + group DGROUP _TEXT + assume cs:DGROUP,ds:DGROUP + + segment _TEXT byte public use16 'CODE' + + org 100h + global _text_start:byte + label _text_start byte + + mov di,80h + cmp [byte di],1 + ja notfound + ifdef WITH_LONG_FILENAME + mov si,offset tazboot_cmd + mov ax,716Ch + xor bx,bx ; R/O + xor cx,cx ; attributes + cwd ; action = open + stc + int 21h + jnc found + mov dx,si + else + mov dx,offset tazboot_cmd + endif + mov ax,3d00h ; read-only+compatibility + ;mov cl,0 ; attribute mask + int 21h + jc notfound +found: + xchg ax,bx + mov ah,3Eh + int 21h + mov cx,endcmd-begcmd+1 + mov si,offset default_arg + rep + movsb +notfound: + mov di,9000h + mov si,offset tomove + mov ch,1 + jmp move +tomove: + cld + mov di,100h + mov si,offset endcmd + mov ch,40h +move: + push di + rep + movsw + ret + +default_arg db endcmd-begcmd +begcmd db " @" +tazboot_cmd db "tazboot.cmd",0 +endcmd: + +;*************************************************************** + + ends _TEXT + + + end _text_start + +;###### END OF FILE ############################################ diff -r 24235f64ae6c -r d33c3c211ef8 linld/stuff/src/HEADER.CMD --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/linld/stuff/src/HEADER.CMD Mon May 25 10:10:30 2020 +0000 @@ -0,0 +1,1 @@ +header.obj, header diff -r 24235f64ae6c -r d33c3c211ef8 linld/stuff/src/_END.ASM --- a/linld/stuff/src/_END.ASM Sun May 24 16:43:25 2020 +0000 +++ b/linld/stuff/src/_END.ASM Mon May 25 10:10:30 2020 +0000 @@ -17,7 +17,7 @@ label _data_end byte ends _DATA - segment _BSS byte public use16 'BSS' + segment _BSS word public use16 'BSS' STACK_SIZE = 1024 global _version_string:byte diff -r 24235f64ae6c -r d33c3c211ef8 lxappearance-dev/receipt --- a/lxappearance-dev/receipt Sun May 24 16:43:25 2020 +0000 +++ b/lxappearance-dev/receipt Mon May 25 10:10:30 2020 +0000 @@ -7,7 +7,7 @@ MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" WANTED="lxappearance" -WEB_SITE="https://lxde.org/" +WEB_SITE="https://wiki.lxde.org/en/LXAppearance" TAGS="LXDE" HOST_ARCH="i486 arm" diff -r 24235f64ae6c -r d33c3c211ef8 lxappearance/receipt --- a/lxappearance/receipt Sun May 24 16:43:25 2020 +0000 +++ b/lxappearance/receipt Mon May 25 10:10:30 2020 +0000 @@ -6,7 +6,7 @@ SHORT_DESC="LXDE GTK+ theme switcher" MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" -WEB_SITE="http://lxde.sourceforge.net/" +WEB_SITE="https://wiki.lxde.org/en/LXAppearance" TARBALL="$PACKAGE-$VERSION.tar.xz" WGET_URL="$SF_MIRROR/lxde/$TARBALL" TAGS="LXDE" diff -r 24235f64ae6c -r d33c3c211ef8 lxdm/receipt --- a/lxdm/receipt Sun May 24 16:43:25 2020 +0000 +++ b/lxdm/receipt Mon May 25 10:10:30 2020 +0000 @@ -7,7 +7,7 @@ MAINTAINER="pankso@slitaz.org" LICENSE="GPL3" TARBALL="$PACKAGE-$VERSION.tar.xz" -WEB_SITE="https://lxde.org/" +WEB_SITE="https://wiki.lxde.org/en/LXDM" WGET_URL="$SF_MIRROR/lxde/$TARBALL" TAGS="LXDE" diff -r 24235f64ae6c -r d33c3c211ef8 lxrandr/receipt --- a/lxrandr/receipt Sun May 24 16:43:25 2020 +0000 +++ b/lxrandr/receipt Mon May 25 10:10:30 2020 +0000 @@ -7,7 +7,7 @@ SHORT_DESC="LXDE monitor configuration tool." MAINTAINER="gokhlayeh@slitaz.org" LICENSE="GPL2" -WEB_SITE="https://lxde.org" +WEB_SITE="https://wiki.lxde.org/en/LXRandR" TARBALL="$PACKAGE-$VERSION.tar.xz" WGET_URL="$SF_MIRROR/lxde/$TARBALL" diff -r 24235f64ae6c -r d33c3c211ef8 lxtask/receipt --- a/lxtask/receipt Sun May 24 16:43:25 2020 +0000 +++ b/lxtask/receipt Mon May 25 10:10:30 2020 +0000 @@ -7,7 +7,7 @@ SHORT_DESC="LXDE task manager." MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" -WEB_SITE="https://lxde.org" +WEB_SITE="https://wiki.lxde.org/en/LXTask" TARBALL="$PACKAGE-$VERSION.tar.xz" WGET_URL="$SF_MIRROR/lxde/$TARBALL" diff -r 24235f64ae6c -r d33c3c211ef8 syslinux/receipt --- a/syslinux/receipt Sun May 24 16:43:25 2020 +0000 +++ b/syslinux/receipt Mon May 25 10:10:30 2020 +0000 @@ -43,7 +43,8 @@ $i > kbd/$(basename $i .map.gz) done cp -a $stuff/iso2exe . - cp $LINLD/*/tazboot.com iso2exe/boot.com + cp $LINLD/*/isoboot.com iso2exe/boot.com + cp $LINLD/*/header.com iso2exe/header.com make -C iso2exe } diff -r 24235f64ae6c -r d33c3c211ef8 syslinux/stuff/iso2exe/init --- a/syslinux/stuff/iso2exe/init Sun May 24 16:43:25 2020 +0000 +++ b/syslinux/stuff/iso2exe/init Mon May 25 10:10:30 2020 +0000 @@ -126,16 +126,15 @@ gettazboot() { echo -e "\nCreating $(basename $1) ..." - X=$(($(get 20 /mnt/$ISO) - 0xC0)) - [ $X -lt 30000 ] && X=$((0x7FF0)) - O=$(($(get 64 /mnt/$ISO) - 0xC0)) - L=$(($X - $(get 24 /mnt/$ISO) - $O)) - S=$((32+$L)) + S=$((32+HEADERSZ)) P=$((($S+511)/512)) E=$((4096-(32*$P))) - words2bin 0x5A4D $(($S%512)) $P 0 2 $E -1 $((${2:-0}-16)) \ + words2bin 0x5A4D $(($S%512)) $P 0 2 $E -1 -16 \ -2 0 256 -16 28 0x6C53 0x5469 0x7A61 > $1 - ddq bs=1 count=$(echo $L) skip=$(echo $O) if=/mnt/$ISO >> $1 + uudecode - >> $1 << EOT +HEADERCODE +EOT + ddq if=/mnt/slitaz/boot/linld.com >> $1 } checkmagic() @@ -437,18 +436,15 @@ $DIALOG --clear --title " SliTaz bootloader for DOS " \ --yes-label "Install" --yesno \ "\nThe file TAZBOOT.EXE will be created in the top directory. It supports -any linux kernel, multiple initramfs, a kernel command line and -an ISO image file loopback (retrieves files from an ISO file).\n\n -Usage: tazboot.exe [[@commands]|[kernel=] -[initrd=[,...]] [bootfrom=] cmdline args ...]\n\n -Defaults: tazboot @tazboot.cmd or tazboot kernel=bzImage auto\n\n\ +any linux kernel, multiple initramfs, and a kernel command line.\n\n +Usage: tazboot.exe [[@commands]|[image=] +[initrd=[,...]] cmdline args ...]\n\n +Defaults: tazboot @tazboot.cmd or tazboot image=bzImage auto\n\n\ Examples for tazboot.cmd:\n\n\ - bootfrom=\\isos\\slitaz-4.0.iso\n\ kernel=boot/bzImage\n\ initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz\n\ autologin\n\n\ - kernel=\\slitaz\\vmlinuz root=/dev/sda5 ro\n\n -Unlike GRUB4DOS, it doesn't require unfragmented ISO image files.\n" 24 78 + image=\\slitaz\\vmlinuz root=/dev/sda5 ro\n" 24 78 [ $? -eq 0 ] || return gettazboot /mnt/tazboot.exe } @@ -745,6 +741,8 @@ if [ "$1" = "--build" ]; then #install-begin cp $0 $0.tmp + uuencode -m - < header.com | sed -e '/^HEADERCODE$/r/dev/stdin' \ + -e "s|HEADERSZ|$(stat -c %s header.com)|" -e '/^HEADERCODE$/d' -i $0.tmp uuencode -m - < ifmem.bin | sed -e 's|^[ \t]*||;s|[ \t]*###.*||' \ -e 's| *;;|;;|;s|\t\t*|\t|g' \ -e '/^ifmemcode$/r/dev/stdin' -e '/^ifmemcode$/d' -i $0.tmp @@ -1221,7 +1219,7 @@ $(xfile tazlito "flavor" "Get flavor file") \ $(fddata "fdbootstrap" "Create a floppy bootstrap") \ $(cdfile isolinux.cfg "floppyset" "Boot floppy set") \ - "tazboot" "Get tazboot.exe Linux loader" \ +$(cdfile linld.com "tazboot" "Get tazboot.exe Linux loader") \ $(cdexe boot/bzImage "bzimage" "Get linux DOS/EXE file") \ $(cdexe "memtest*" "memtest" "Get Memtest86 DOS/EXE file") \ $(cdfilef "memtest*" "fdmemtest" "Create a Memtest86 boot floppy") \ diff -r 24235f64ae6c -r d33c3c211ef8 syslinux/stuff/iso2exe/iso2exe.c --- a/syslinux/stuff/iso2exe/iso2exe.c Sun May 24 16:43:25 2020 +0000 +++ b/syslinux/stuff/iso2exe/iso2exe.c Mon May 25 10:10:30 2020 +0000 @@ -497,7 +497,7 @@ SYSLINUX_MBR, /* 1 */ FLAVOR_INFO, /* 2 */ FLOPPY_BOOT, /* 3 */ - TAZBOOT_COM, /* 4 */ + ISOBOOT_COM, /* 4 */ ROOTFS_GZ, /* 5 */ DOSSTUB, /* 6 */ BOOT_MD5, /* 7 */ @@ -530,7 +530,7 @@ case FLOPPY_BOOT: /* floppy.boot */ file_size = BYTE(buffer+26)*512; file_offset = WORD(buffer+64) - 0xC0 - file_size; break; - case TAZBOOT_COM: /* tazboot.com */ + case ISOBOOT_COM: /* isoboot.com */ file_offset = WORD(buffer+64) - 0xC0; file_size = stub - WORD(buffer+24) - file_offset; break; case ROOTFS_GZ: /* rootfs.gz */ diff -r 24235f64ae6c -r d33c3c211ef8 syslinux/stuff/iso2exe/iso2exe.sh --- a/syslinux/stuff/iso2exe/iso2exe.sh Sun May 24 16:43:25 2020 +0000 +++ b/syslinux/stuff/iso2exe/iso2exe.sh Mon May 25 10:10:30 2020 +0000 @@ -170,7 +170,7 @@ floppy.boot) SIZE=$(($(get 26 "$ISO" 1)*512)) OFFSET=$(($(get 64 "$ISO") - 0xC0 - $SIZE));; rootfs.gz) SIZE=$(get 24 "$ISO"); OFFSET=$(($stub - $SIZE));; - tazboot.com) OFFSET=$(($(get 64 "$ISO") - 0xC0)) + isoboot.com) OFFSET=$(($(get 64 "$ISO") - 0xC0)) SIZE=$(($stub - $(get 24 "$ISO") - $OFFSET));; dosstub) [ "$dosstub" ] && OFFSET=$stub && SIZE=$((0x7FF0 - $OFFSET));; boot.md5) [ $(get 0 "$ISO") -eq 23117 ] && @@ -242,7 +242,7 @@ list() { HEAP=0 - for f in win32.exe syslinux.mbr flavor.info floppy.boot tazboot.com \ + for f in win32.exe syslinux.mbr flavor.info floppy.boot isoboot.com \ rootfs.gz dosstub boot.md5 fs.iso custom.magic custom.append \ custom.initrd; do fileofs $f @@ -423,7 +423,7 @@ SYSLINUX_MBR syslinux.mbr FLAVOR_INFO flavor.info FLOPPY_BOOT floppy.boot -TAZBOOT_COM tazboot.com +ISOBOOT_COM isoboot.com ROOTFS_GZ rootfs.gz DOSSTUB dosstub BOOT_MD5 boot.md5 diff -r 24235f64ae6c -r d33c3c211ef8 syslinux/stuff/iso2exe/taziso --- a/syslinux/stuff/iso2exe/taziso Sun May 24 16:43:25 2020 +0000 +++ b/syslinux/stuff/iso2exe/taziso Mon May 25 10:10:30 2020 +0000 @@ -32,16 +32,15 @@ gettazboot() { echo -e "\nCreating $(basename $1) ..." - X=$(($(get 20 /mnt/$ISO) - 0xC0)) - [ $X -lt 30000 ] && X=$((0x7FF0)) - O=$(($(get 64 "$ISO") - 0xC0)) - L=$(($X - $(get 24 "$ISO") - $O)) - S=$((32+$L)) + S=$((32+HEADERSZ)) P=$((($S+511)/512)) E=$((4096-(32*$P))) - words2bin 0x5A4D $(($S%512)) $P 0 2 $E -1 $((${2:-0}-16)) \ + words2bin 0x5A4D $(($S%512)) $P 0 2 $E -1 -16 \ -2 0 256 -16 28 0x6C53 0x5469 0x7A61 > $1 - ddq bs=1 count=$(echo $L) skip=$(echo $O) if="$ISO" >> $1 + uudecode - >> $1 << EOT +HEADERCODE +EOT + ddq if=/mnt/slitaz/boot/linld.com >> $1 } uncpio() @@ -576,18 +575,15 @@ $DIALOG --clear --title " SliTaz bootloader for DOS " \ --yes-label "Install" --yesno \ "\nThe file TAZBOOT.EXE will be created in the top directory. It supports -any linux kernel, multiple initramfs, a kernel command line and -an ISO image file loopback (retrieves files from an ISO file).\n\n -Usage: tazboot.exe [[@commands]|[kernel=] -[initrd=[,...]] [bootfrom=] cmdline args ...]\n\n -Defaults: tazboot @tazboot.cmd or tazboot kernel=bzImage auto\n\n\ +any linux kernel, multiple initramfs and a kernel command line.\n\n +Usage: tazboot.exe [[@commands]|[image=] +[initrd=[,...]] cmdline args ...]\n\n +Defaults: tazboot @tazboot.cmd or tazboot image=bzImage auto\n\n\ Examples for tazboot.cmd:\n\n\ - bootfrom=\\isos\\slitaz-4.0.iso\n\ - kernel=boot/bzImage\n\ + image=boot/bzImage\n\ initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz\n\ autologin\n\n\ - kernel=\\slitaz\\vmlinuz root=/dev/sda5 ro\n\n -Unlike GRUB4DOS, it doesn't require unfragmented ISO image files.\n" 0 0 + image=\\slitaz\\vmlinuz root=/dev/sda5 ro\n" 0 0 [ $? -eq 0 ] || return fi gettazboot tazboot.exe @@ -825,11 +821,6 @@ [ $(get 32769 "$ISO" 4) -eq 808469571 ] && menuitem "$@" } -hastazboot() -{ - [ $(get 0 "$ISO") -eq 23117 ] && menuitem "$@" -} - burnable() { [ "$(sed '/Can wr.*1$/!d' /proc/sys/dev/cdrom/info 2> /dev/null)" ] && @@ -1128,6 +1119,8 @@ } if [ "$1" = "--build" ]; then #install-begin + uuencode -m - < header.com | sed -e '/^HEADERCODE$/r/dev/stdin' \ + -e "s|HEADERSZ|$(stat -c %s header.com)|" -e '/^HEADERCODE$/d' -i $0 uuencode -m - < ifmem.bin | sed -e '/^ifmemcode$/r/dev/stdin' \ -e '/^ifmemcode$/d' -i $0 uuencode -m - < bootloader.bin | sed -e '/^bootloader$/r/dev/stdin' \ @@ -1382,7 +1375,7 @@ $(hasflavinfo "showfavinfo" "Show flavor extra info") \ $(hasflavor "flavor" "Get flavor file") \ $(cdfile isolinux.cfg "floppyset" "Boot floppy set") \ -$(hastazboot "tazboot" "Get tazboot.exe Linux loader") \ +$(cdfile linld.com "tazboot" "Get tazboot.exe Linux loader") \ $(cdexe boot/bzImage "bzimage" "Get linux DOS/EXE file") \ $(cdexe 'memtest*' "memtest" "Get Memtest86 DOS/EXE file") \ $(cdfilef 'memtest*' "fdmemtest" "Create a Memtest86 boot floppy") \