oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ISO building

Browse Source 
-Update release.sh to use new stat syntax
-Add missing utils to release bootstrap dirs
-Remove needless dependency in ramdisk Makefile
This commit is contained in:
Arun Thomas 2011-07-20 10:19:28 +02:00
parent 3eb22ca4d1
commit 0d9095d116
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/ramdisk/Makefile
View File

@ -18,7 +18,6 @@ STRIPFLAG+= -s
EXTRA=system.conf passwd rs.single EXTRA=system.conf passwd rs.single
CPPFLAGS+= -I${MINIXSRCDIR}/servers -I${MINIXSRCDIR} CPPFLAGS+= -I${MINIXSRCDIR}/servers -I${MINIXSRCDIR}
MAKEDEV=/usr/bin/MAKEDEV
CLEANFILES += $(PROGRAMS) $(SCRIPTS) $(EXTRA) bintoc image image.c t proto.gen CLEANFILES += $(PROGRAMS) $(SCRIPTS) $(EXTRA) bintoc image image.c t proto.gen
install: all install: all
@ -147,7 +146,7 @@ passwd: ../../etc/passwd
rs.single: ../../etc/rs.single rs.single: ../../etc/rs.single
install ${STRIPFLAG} ../../etc/$@ $@ install ${STRIPFLAG} ../../etc/$@ $@
proto.gen: $(PROGRAMS) $(SCRIPTS) $(MAKEDEV) proto.sh proto proto.gen: $(PROGRAMS) $(SCRIPTS) proto.sh proto
sh -e proto.sh >proto.gen sh -e proto.sh >proto.gen
.if ${OBJECT_FMT} == "ELF" .if ${OBJECT_FMT} == "ELF"

7
tools/release.sh
View File

@ -192,8 +192,9 @@ mkdir -p $RELEASEPACKAGE
echo " * Transfering bootstrap dirs to $RELEASEDIR" echo " * Transfering bootstrap dirs to $RELEASEDIR"
cp -p /bin/* /usr/bin/* /sbin/* $RELEASEDIR/$XBIN cp -p /bin/* /usr/bin/* /sbin/* $RELEASEDIR/$XBIN
cp -rp /usr/lib $RELEASEDIR/usr cp -rp /usr/lib $RELEASEDIR/usr
cp -rp /bin/sh /bin/echo /bin/install /bin/rm $RELEASEDIR/bin cp -rp /bin/sh /bin/echo /bin/install /bin/rm /bin/sed $RELEASEDIR/bin
cp -rp /usr/bin/make /usr/bin/yacc /usr/bin/lex /usr/bin/asmconv $RELEASEDIR/usr/bin cp -rp /usr/bin/make /usr/bin/yacc /usr/bin/lex /usr/bin/asmconv \
/usr/bin/grep /usr/bin/egrep /usr/bin/awk $RELEASEDIR/usr/bin
CONFIGHEADER=$RELEASEDIR/usr/src/common/include/minix/sys_config.h CONFIGHEADER=$RELEASEDIR/usr/src/common/include/minix/sys_config.h
@ -387,7 +388,7 @@ else
then then
echo "Appending Minix root and usr filesystem" echo "Appending Minix root and usr filesystem"
# Pad ISO out to cylinder boundary # Pad ISO out to cylinder boundary
isobytes=`stat -size $IMG` isobytes=`stat -f %z $IMG`
isosects=`expr $isobytes / 512` isosects=`expr $isobytes / 512`
isopad=`expr $secs - '(' $isosects % $secs ')'` isopad=`expr $secs - '(' $isosects % $secs ')'`
dd if=/dev/zero count=$isopad >>$IMG dd if=/dev/zero count=$isopad >>$IMG