Re: m68k boot-floppies
On Tue, Apr 04, 2000 at 12:38:15AM -0400, Adam Di Carlo wrote:
> > I edited keymaps.sh to create .bmp files, not .bmap files, otherwise I can
> > not load a keymap in dbootstrap.
>
> Committed?
No, I dont commit a thing, but Ill append my current patch. Please someone
check if everthing is ok (mac might need improvement and vme is totally
unsorted, do they need install.tgz as well? And tftplilo is still missing).
I dropped the lha files, since on Amiga I can not unpack lh6 compression
and I was unable to create lh5 compressed files. Everything is not in tgz
files, boot-floppies can go into main?
m68k-support are the special files (amiboot, Penguin, ...) for m68k? Need to
create that file then, can that go into the bf archive as well?
I am still working on some amiga icons (where can I find a good quality
version of the official logo, the swirl on the bottle, I want that for
a drawer, when you click it, the swirl pops up), need to put in a newer
Penguin booter for Mac, and tftplilo for vme it seems.
> No, run 'dpkg-buildpackage -uc -us -m<addr> -B' as root and then sign
> it as your user acct. You may have to add an 'Architecture' field to
> the .changes file manually due to a dpkg-dev bug.
It has to run through the whole build _again_? Umph... ok, think it has to
be done anyway, since amiga-fdisk segfaults... Sven, can you try to fix
this?
make USE_READLINE=yes
make[1]: Entering directory `/build/source/amiga-fdisk-0.04'
gcc -O2 -fomit-frame-pointer -Wall -I./include -c -o amigastuff.o amigastuff.c
amigastuff.c: In function `DosType':
amigastuff.c:942: warning: unsigned int format, ULONG arg (arg 3)
Ah, the install guides need to be updated, for potato, for the new directory
layout and maybe much more. I will definetely _not_ do this.
Christian
--
--- boot-floppies/release.sh.orig Thu Mar 30 19:09:25 2000
+++ boot-floppies/release.sh Tue Apr 4 09:00:01 2000
@@ -350,19 +350,24 @@
# Atari install kit: lzh archive
#
mkdir -p $release/atari
- mkdir -p $release/atari/debian
- cp resc1440atari.bin $release/atari/debian/resc1440.bin
- cp drv1440atari.bin $release/atari/debian/drv1440.bin
- cp linuxatari $release/atari/debian/linux
- cp sys_mapatari.gz $release/atari/debian/sysmap.gz
- cp rootatari.bin $release/atari/debian/root.bin
- cp lowmemrd.bin $release/atari/debian/
- cp m68k-specials/bootstra.ttp $release/atari/debian/bootstra.prg
- # cp m68k-specials/bootargs $release/atari/debian/bootargs
- echo "-s -k linux -r root.bin root=/dev/ram video=keep load_ramdisk=1" > $release/atari/debian/bootargs
- cp m68k-specials/debian-atari.txt $release/atari/debian/install.doc
- # create lzh archive
- (cd $release/atari/ && lha a ../atariinstall.lzh debian/)
+ mkdir -p $release/atari/images-1.44/
+# mv $release/images-1.44/resc1440atari.bin $release/atari/images-1.44/resc1440.bin
+# mv $release/images-1.44/drv1440atari.bin $release/atari/images-1.44/drv1440.bin
+ mv $release/images-1.44/rootatari.bin $release/atari/images-1.44/root.bin
+ mv $release/images-1.44/rescueatari.bin $release/atari/images-1.44/rescue.bin
+ mv $release/images-1.44/driveratari-1.bin $release/atari/images-1.44/driver.bin
+ mv $release/linuxatari $release/atari/linux
+ mv $release/driversatari.tgz $release/atari/drivers.tgz
+ mv $release/sys_mapatari.gz $release/atari/sysmap.gz
+# no more lowmem?
+# cp lowmemrd.bin $release/atari/debian/
+ cp m68k-specials/bootstra.ttp $release/atari/images-1.44/bootstra.prg
+ # cp m68k-specials/bootargs $release/atari/images-1.44/bootargs
+ echo "-s -k linux -r root.bin root=/dev/ram video=keep load_ramdisk=1" > $release/atari/images-1.44/bootargs
+ cp m68k-specials/debian-atari.txt $release/atari/images-1.44/install.doc
+# # create lzh archive
+# (cd $release/atari/ && lha a ../atariinstall.lzh debian/)
+ (cd $release && tar cvfz atariinstall.tgz atari/*)
# clean up
rm -rf $release/atari
#
@@ -374,17 +379,23 @@
# Amiga install kit: lzh archive
#
mkdir -p $release/amiga
- mkdir -p $release/amiga/debian
+ mkdir -p $release/amiga/images-1.44
# unpack AmigaOS magic from m68k support directory
- (cd $release/amiga/ && lha x ../../m68k-specials/amiga-kit.lzh)
- cp resc1440amiga.bin $release/amiga/debian/resc1440.bin
- cp drv1440amiga.bin $release/amiga/debian/drv1440.bin
- cp linuxamiga $release/amiga/debian/
- cp sys_mapamiga.gz $release/amiga/debian/
- cp rootamiga.bin $release/amiga/debian/
- cp lowmemrd.bin $release/amiga/debian/
- # create lzh archive
- (cd $release/amiga/ && lha a ../amigainstall.lzh *)
+# (cd $release/amiga/ && lha x ../../m68k-specials/amiga-kit.lzh)
+ (cd $release/amiga/ && tar xvfz ../../m68k-specials/amiga-kit.tgz)
+# mv $release/images-1.44/resc1440amiga.bin $release/amiga/images-1.44/resc1440.bin
+# mv $release/images-1.44/drv1440amiga.bin $release/amiga/images-1.44/drv1440.bin
+ mv $release/images-1.44/rootamiga.bin $release/amiga/images-1.44/root.bin
+ mv $release/images-1.44/rescueamiga.bin $release/amiga/images-1.44/rescue.bin
+ mv $release/images-1.44/driveramiga-1.bin $release/amiga/images-1.44/driver.bin
+ mv $release/linuxamiga $release/amiga/images-1.44/linux
+ mv $release/driversamiga.tgz $release/amiga/images-1.44/drivers.tgz
+ mv $release/sys_mapamiga.gz $release/amiga/sysmap.gz
+# no more lowmem?
+# cp lowmemrd.bin $release/amiga/images-1.44/
+# # create lzh archive
+# (cd $release/amiga/ && lha a ../amigainstall.lzh *)
+ (cd $release && tar cvfz amigainstall.tgz amiga/*)
# clean up
rm -rf $release/amiga
#
@@ -395,7 +406,8 @@
# Mac install kit: HFS floppy image, to be packaged as StuffIt archive
#
# create HFS floppy image
- dd if=/dev/zero of=$release/macinstall-floppy-hfs.img bs=1024 count=1440
+# dd if=/dev/zero of=$release/macinstall-floppy-hfs.img bs=1024 count=1440
+ dd if=/dev/zero of=$release/macinstall-floppy-hfs.img bs=1024 count=2880
hformat -l "Debian/68k" $release/macinstall-floppy-hfs.img
# mount it (':' is top dir)
hmount $release/macinstall-floppy-hfs.img
@@ -430,7 +442,8 @@
# Kudos Brad Midgley, <brad@pht.com> for the tricks!
#
# copy booter as BinHex
- hcopy -b m68k-specials/Penguin-17.hqx :
+# hcopy -b m68k-specials/Penguin-17.hqx :
+ hcopy -b m68k-specials/Penguin-16.hqx :
# copy Preferences as BinHex
hcopy -b m68k-specials/Penguin_Prefs_floppy.hqx :"Penguin Prefs"
# copy install doc as text
@@ -439,23 +452,33 @@
# package Mac booter stuff for the CD install dir
# (tar format until I can come up with something nicer)
mkdir -p $release/mac
- mkdir -p $release/mac/install/
- mkdir -p $release/mac/install/mac/
- cp m68k-specials/Penguin-17.hqx $release/mac/install/mac/
- #cp m68k-specials/Penguin_Prefs_CD.hqx $release/mac/install/mac/
- #cp m68k-specials/Penguin_Prefs_CD_autoboot.hqx $release/mac/install/mac/
+ mkdir -p $release/mac/images-1.44/
+ mkdir -p $release/mac/images-1.44/mac/
+ mv $release/images-1.44/rootmac.bin $release/mac/images-1.44/root.bin
+ mv $release/images-1.44/rescuemac.bin $release/mac/images-1.44/rescue.bin
+ mv $release/images-1.44/drivermac-1.bin $release/mac/images-1.44/driver.bin
+ mv $release/linuxmac $release/mac/images-1.44/linux
+ mv $release/driversmac.tgz $release/mac/images-1.44/drivers.tgz
+ mv $release/sys_mapmac.gz $release/mac/sysmap.gz
+# cp m68k-specials/Penguin-17.hqx $release/mac/images-1.44/mac/
+ cp m68k-specials/Penguin-16.hqx $release/mac/
+ #cp m68k-specials/Penguin_Prefs_CD.hqx $release/mac/images-1.44/mac/
+ #cp m68k-specials/Penguin_Prefs_CD_autoboot.hqx $release/mac/images-1.44/mac/
dd if=/dev/zero of=$release/macinstall-temp.img bs=1024 count=1440
hformat $release/macinstall-temp.img
# mount it (':' is top dir)
hmount $release/macinstall-temp.img
hcopy -b m68k-specials/Penguin_Prefs_CD.hqx :"Penguin Prefs"
hcopy -b m68k-specials/Penguin_Prefs_CD_autoboot.hqx :"Penguin Prefs (autoboot)"
- hcopy -b :"Penguin Prefs" $release/mac/install/mac/
- hcopy -b :"Penguin Prefs (autoboot)" $release/mac/install/mac/
+# hcopy -b :"Penguin Prefs" $release/mac/images-1.44/mac/
+# hcopy -b :"Penguin Prefs (autoboot)" $release/mac/images-1.44/mac/
+ hcopy -b :"Penguin Prefs" $release/mac/
+ hcopy -b :"Penguin Prefs (autoboot)" $release/mac/
humount $release/macinstall-temp.img
rm $release/macinstall-temp.img
- cp m68k-specials/debian-mac.txt $release/mac/install/mac/
- (cd $release/mac && tar cfvz ../macinstall.tar.gz install/)
+# cp m68k-specials/debian-mac.txt $release/mac/images-1.44/mac/
+ cp m68k-specials/debian-mac.txt $release/mac/
+ (cd $release/mac && tar cfvz ../macinstall.tar.gz images-1.44/)
# clean up
rm -rf $release/mac
#
@@ -465,6 +488,25 @@
#
# VME stuff
#
+# bvme6000
+ mkdir -p $release/bvme6000
+ mkdir -p $release/bvme6000/images-1.44
+ mv $release/rootbvme6000.bin $release/bvme6000/images-1.44/root.bin
+ mv $release/images-1.44/rescuebvme6000.bin $release/bvme6000/images-1.44/rescue.bin
+ mv $release/images-1.44/driverbvme6000-1.bin $release/bvme6000/images-1.44/driver.bin
+ mv $release/linuxbvme6000 $release/bvme6000/images-1.44/linux
+ mv $release/driversbvme6000.tgz $release/bvme6000/images-1.44/drivers.tgz
+ mv $release/sys_mapbvme6000.gz $release/bvme6000/sysmap.gz
+# mvme16x
+ mkdir -p $release/mvme16x
+ mkdir -p $release/mvme16x/images-1.44
+ mv $release/rootmvme16x.bin $release/mvme16x/images-1.44/root.bin
+ mv $release/images-1.44/rescuemvme16x.bin $release/mvme16x/images-1.44/rescue.bin
+ mv $release/images-1.44/drivermvme16x-1.bin $release/mvme16x/images-1.44/driver.bin
+ mv $release/linuxmvme16x $release/mvme16x/images-1.44/linux
+ mv $release/driversmvme16x.tgz $release/mvme16x/images-1.44/drivers.tgz
+ mv $release/sys_mapmvme16x.gz $release/mvme16x/sysmap.gz
+# generic?
(rm -rf /var/tmp/extract-tftplilo; \
mkdir /var/tmp/extract-tftplilo; \
dpkg-deb --extract $(tftplilo) /var/tmp/extract-tftplilo; \
@@ -483,7 +525,8 @@
#
# Copy the m68k magic used for this build to $release/
#
- cp m68k-specials/m68k-support.tar.gz $release/
+# cp m68k-specials/m68k-support.tar.gz $release/
+ echo where is m68k-support.tar.gz?
# map files; tell the FTP maintainer what goes where
cp m68k-specials/disks-m68k.map $release/
cp m68k-specials/cd-m68k.map $release/
--- boot-floppies/keymaps.sh.orig Thu Mar 30 19:09:24 2000
+++ boot-floppies/keymaps.sh Tue Apr 4 00:12:45 2000
@@ -183,7 +183,7 @@
f=`basename $i`
mkdir -p $kmaptmpdir/$k
(cd usr/share/keymaps/$k && zcat $f | $scriptdir/loadkeys -b \
- > $kmaptmpdir/$k/$j\.bmap)
+ > $kmaptmpdir/$k/$j\.bmp)
done
)
testexit
Reply to: