wok-6.x rev 14317
elementary-dev: update deps
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sun Apr 07 13:15:40 2013 +0200 (2013-04-07) |
| parents | 8fc2c58382da |
| children | 4cddcddc0170 |
| files | elementary-dev/receipt syslinux/stuff/iso2exe/Makefile syslinux/stuff/iso2exe/init syslinux/stuff/iso2exe/isohybrid.ico syslinux/stuff/iso2exe/isohybrid.rc syslinux/stuff/iso2exe/mvcom.S |
line diff
1.1 --- a/elementary-dev/receipt Sun Apr 07 10:37:48 2013 +0200 1.2 +++ b/elementary-dev/receipt Sun Apr 07 13:15:40 2013 +0200 1.3 @@ -8,6 +8,8 @@ 1.4 WANTED="elementary" 1.5 WEB_SITE="http://www.enlightenment.org/" 1.6 1.7 +DEPENDS="efreet-dev" 1.8 + 1.9 # Rules to gen a SliTaz package suitable for Tazpkg. 1.10 genpkg_rules() 1.11 {
2.1 --- a/syslinux/stuff/iso2exe/Makefile Sun Apr 07 10:37:48 2013 +0200 2.2 +++ b/syslinux/stuff/iso2exe/Makefile Sun Apr 07 13:15:40 2013 +0200 2.3 @@ -9,6 +9,9 @@ 2.4 chmod +x $@ 2.5 ./$@ --build boot.com bootiso.bin init win32.exe 2.6 2.7 +isohybrid.res: isohybrid.rc isohybrid.ico 2.8 + i586-pc-mingw32-windres $< -O coff -o $@ 2.9 + 2.10 iso2exe.h: iso2exe ../mbr/isohdpfx.bin 2.11 chmod +x iso2exe.sh 2.12 ./iso2exe.sh --array ../mbr/isohdpfx.bin > $@ 2.13 @@ -16,8 +19,8 @@ 2.14 iso2exe.com: iso2exe.c iso2exe.h 2.15 $(BCC) $(BCCFLAGS) -o $@ iso2exe.c && upx --ultra-brute $@ 2.16 2.17 -iso2exe.exe: iso2exe.c iso2exe.h 2.18 - i586-pc-mingw32-gcc -Os -s -o $@ iso2exe.c -lws2_32 2.19 +iso2exe.exe: iso2exe.c iso2exe.h isohybrid.res 2.20 + i586-pc-mingw32-gcc -Os -s -o $@ iso2exe.c isohybrid.res -lws2_32 2.21 2.22 isohybrid.exe: iso2exe.sh mvcom.bin iso2exe.com iso2exe.exe 2.23 ./iso2exe.sh --exe mvcom.bin iso2exe.com iso2exe.exe > $@
3.1 --- a/syslinux/stuff/iso2exe/init Sun Apr 07 10:37:48 2013 +0200 3.2 +++ b/syslinux/stuff/iso2exe/init Sun Apr 07 13:15:40 2013 +0200 3.3 @@ -128,7 +128,7 @@ 3.4 fi > /mnt/slitaz/boot/rootfs.gz 3.5 mkdir /mnt/slitaz/home 3.6 initrd=rootfs.gz 3.7 - extraargs="/home=$(getuuid)/slitaz/home" # FIXME /dos 3.8 + extraargs="/home=$(getuuid)/slitaz/home" # FIXME /mnt/dos 3.9 else 3.10 if [ -d /media/cdrom/fs ]; then 3.11 cp -a /media/cdrom/fs/. /mnt/slitaz 3.12 @@ -196,6 +196,7 @@ 3.13 " 19 70 3.14 [ $? -eq 0 ] || return 3.15 doinstall 3.16 + [ -x /sbin/init ] || return 3.17 umount -d /media/cdrom 3.18 umount /proc 3.19 exec chroot /mnt/slitaz /sbin/init 3.20 @@ -225,10 +226,10 @@ 3.21 ( zcat $i 2> /dev/null || unlzma -c $i ) | cpio -idmu 3.22 done 3.23 fi 3.24 + [ -x /sbin/init ] || return 3.25 umount -d /media/cdrom 3.26 - mkdir /dos 3.27 - mount --move /mnt /dos 3.28 - ln -s /dos/slitaz/home /home 3.29 + mount --move /mnt /mnt/dos 3.30 + ln -s /mnt/dos/slitaz/home /home 3.31 umount /proc 3.32 exec /sbin/init 3.33 }
4.1 Binary file syslinux/stuff/iso2exe/isohybrid.ico has changed
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/syslinux/stuff/iso2exe/isohybrid.rc Sun Apr 07 13:15:40 2013 +0200 5.3 @@ -0,0 +1,26 @@ 5.4 +/* http://msdn.microsoft.com/en-us/library/aa381058.aspx */ 5.5 + 5.6 +id ICON "./isohybrid.ico" /* BMP32x32 */ 5.7 +VS_VERSION_INFO VERSIONINFO 5.8 +FILEVERSION 1,0,0,0 5.9 +PRODUCTVERSION 1,0,0,0 5.10 +BEGIN 5.11 + BLOCK "StringFileInfo" 5.12 + BEGIN 5.13 + BLOCK "040904E4" 5.14 + BEGIN 5.15 + VALUE "CompanyName", "SliTaz" 5.16 + VALUE "FileDescription", "Hybrid ISO9660 creator" 5.17 + VALUE "FileVersion", "1.0" 5.18 + VALUE "InternalName", "isohybrid" 5.19 + VALUE "LegalCopyright", "SliTaz" 5.20 + VALUE "ProductName", "isohybrid" 5.21 + VALUE "ProductVersion", "1.0" 5.22 + END 5.23 + END 5.24 + 5.25 + BLOCK "VarFileInfo" 5.26 + BEGIN 5.27 + VALUE "Translation", 0x409, 1252 5.28 + END 5.29 +END