# HG changeset patch # User Pascal Bellard # Date 1437641266 -7200 # Node ID 347588653a930a2baaca940394d2aa728cda561b # Parent 19a9e131dc09127132d96f0dca8e05f877fdecfe linld: add tobzimage (again) diff -r 19a9e131dc09 -r 347588653a93 linld/receipt --- a/linld/receipt Thu Jul 23 10:33:13 2015 +0200 +++ b/linld/receipt Thu Jul 23 10:47:46 2015 +0200 @@ -26,6 +26,10 @@ !compile.bat EOT SDL_VIDEODRIVER=dummy dosbox MAKE.BAT -exit -c "mount D $src" + cc -o tobzimage.o -Wa,-algms=tobzimage.lst -c $stuff/tobzimage.S + objcopy -O binary tobzimage.o tobzimage.bin + cp $stuff/tobzimage . + ./tobzimage --build } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -35,5 +39,5 @@ cp $src/LINLD$(echo $VERSION | sed 's/[^0-9]//')/LINLD.COM \ $fs/usr/share/boot/linld.com cp $stuff/linld.txt $fs/usr/share/boot/ - cp $stuff/tobzimage $fs/usr/bin + cp $src/tobzimage $fs/usr/bin } diff -r 19a9e131dc09 -r 347588653a93 linld/stuff/tobzimage --- a/linld/stuff/tobzimage Thu Jul 23 10:33:13 2015 +0200 +++ b/linld/stuff/tobzimage Thu Jul 23 10:47:46 2015 +0200 @@ -48,12 +48,7 @@ EOT # from tobzimage.S uudecode <> $1 -begin-base64 644 - -H4sIACpPrlUCA3ut4pFSFMzAxAACAg0MDIwMQEKAARXM+cOXxZAgx76vhsnw -P1v40qX7GZg6n+7kZMhiePRnB+PkmQGBQYELxJiA1EYOkFh36JfOZzsZGra0 -nxX97yLy30Wm4Z1A+ZvON/sYWAxP/vP92JX78fTnpYnnqzxzE9NTFQz0DBlG -wQAAAJkasY8AAgAA -==== +tobzimage EOT if [ "$2" ]; then s="$2" @@ -68,4 +63,9 @@ ddq >> $1 } +if [ "$1" == "--build" ]; then #install-begin + uuencode -m - < tobzimage.bin | sed -e '/^tobzimage$/r/dev/stdin' \ + -e '/^tobzimage$/d' -e '/install-begin$/,/install-end$/d' -i $0 + exit +fi #install-end create_bzImage $2 "$3" < $1