- Removed machine dependent directory and command from
src/release/{boot,fixit}_crunch.conf. - Added machine specific fixit_crunch.conf for PC/AT and PC-98 to src/release/$MACHINE. - Use config file in src/release/$MACHINE if exist. If it does not exist, use in src/release.
This commit is contained in:
parent
dba11ce52b
commit
7ec62217f0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=62258
@ -303,7 +303,6 @@ rerelease release:
|
||||
|
||||
clean:
|
||||
rm -rf boot_crunch release.[0-9]
|
||||
rm -rf ${.OBJDIR}/boot_crunch.conf ${.OBJDIR}/fixit_crunch.conf
|
||||
|
||||
# Clean out ${_R} and make the directory structure.
|
||||
release.1:
|
||||
@ -376,13 +375,12 @@ release.4:
|
||||
mkdir -p ${RD}/crunch
|
||||
export RELEASE_BUILD_FIXIT=noway ; \
|
||||
for j in ${CRUNCH_TARGETS} ; do \
|
||||
sed -e "s:MACHINE:${MACHINE}:" \
|
||||
${.CURDIR}/$${j}_crunch.conf > \
|
||||
${.OBJDIR}/$${j}_crunch.conf && \
|
||||
rm -rf $${j}_crunch && \
|
||||
mkdir $${j}_crunch && \
|
||||
( cd $${j}_crunch && \
|
||||
crunchgen ${.OBJDIR}/$${j}_crunch.conf && \
|
||||
( ( [ -f ${.CURDIR}/${MACHINE}/$${j}_crunch.conf ] && \
|
||||
crunchgen ${.CURDIR}/${MACHINE}/$${j}_crunch.conf ) || \
|
||||
( crunchgen ${.CURDIR}/$${j}_crunch.conf ) ) && \
|
||||
${MAKE} -DRELEASE_CRUNCH -f $${j}_crunch.mk subclean all \
|
||||
NOCRYPT=yes "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY") && \
|
||||
mv $${j}_crunch/$${j}_crunch ${RD}/crunch/$${j} && \
|
||||
@ -731,9 +729,15 @@ installCRUNCH:
|
||||
ln -f ${RD}/crunch/${CRUNCH} ${DIR}/${CRUNCH}_crunch ; \
|
||||
fi
|
||||
@chmod 555 ${DIR}/${CRUNCH}_crunch
|
||||
@for i in `crunchgen -l ${.OBJDIR}/${CRUNCH}_crunch.conf` ; do \
|
||||
ln -f ${DIR}/${CRUNCH}_crunch ${DIR}/$$i ; \
|
||||
done
|
||||
@if [ -f ${.CURDIR}/${MACHINE}/${CRUNCH}_crunch.conf ] ; then \
|
||||
for i in `crunchgen -l ${.CURDIR}/${MACHINE}/${CRUNCH}_crunch.conf` ; do \
|
||||
ln -f ${DIR}/${CRUNCH}_crunch ${DIR}/$$i ; \
|
||||
done \
|
||||
else \
|
||||
for i in `crunchgen -l ${.CURDIR}/${CRUNCH}_crunch.conf` ; do \
|
||||
ln -f ${DIR}/${CRUNCH}_crunch ${DIR}/$$i ; \
|
||||
done \
|
||||
fi
|
||||
|
||||
#
|
||||
# --==## Compile a kernel by name ${KERNEL} ##==--
|
||||
|
@ -1,7 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
|
||||
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/MACHINE
|
||||
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
|
||||
srcdirs /usr/src/usr.sbin/pccard
|
||||
|
||||
progs sh find sed test rm
|
||||
|
@ -5,7 +5,6 @@
|
||||
|
||||
srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin
|
||||
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.bin/vi
|
||||
srcdirs /usr/src/sbin/MACHINE
|
||||
|
||||
# second, we list all the programs we want to include in our crunched binary.
|
||||
# The order doesn't matter. Any program that needs hard links to it gets an
|
||||
@ -18,7 +17,7 @@ progs mv rm rmdir sleep sync
|
||||
|
||||
# /sbin stuff
|
||||
|
||||
progs chown clri disklabel dmesg fdisk
|
||||
progs chown clri disklabel dmesg
|
||||
progs mknod mount reboot restore swapon umount
|
||||
|
||||
progs mount_msdos mount_cd9660
|
||||
|
@ -1,7 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
|
||||
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/MACHINE
|
||||
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
|
||||
srcdirs /usr/src/usr.sbin/pccard
|
||||
|
||||
progs sh find sed test rm
|
||||
|
38
release/amd64/fixit_crunch.conf
Normal file
38
release/amd64/fixit_crunch.conf
Normal file
@ -0,0 +1,38 @@
|
||||
# $FreeBSD$
|
||||
|
||||
# first, we list the source dirs that our programs reside in. These are
|
||||
# searched in order listed to find the dir containing each program.
|
||||
|
||||
srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin
|
||||
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.bin/vi
|
||||
srcdirs /usr/src/sbin/i386
|
||||
|
||||
# second, we list all the programs we want to include in our crunched binary.
|
||||
# The order doesn't matter. Any program that needs hard links to it gets an
|
||||
# `ln' directive.
|
||||
|
||||
# /bin stuff
|
||||
|
||||
progs cat chmod chroot cp dd df echo expr kill ln ls mkdir
|
||||
progs mv rm rmdir sleep sync
|
||||
|
||||
# /sbin stuff
|
||||
|
||||
progs chown clri disklabel dmesg fdisk
|
||||
progs mknod mount reboot restore swapon umount
|
||||
|
||||
progs mount_msdos mount_cd9660
|
||||
|
||||
ln restore rrestore
|
||||
ln chown chgrp
|
||||
|
||||
# /usr/bin stuff
|
||||
|
||||
progs ftp telnet vi grep
|
||||
ln vi view
|
||||
ln vi ex
|
||||
|
||||
# finally, we specify the libraries to link in with our binary
|
||||
|
||||
libs -lcrypt -ltelnet -lutil -ll -lm
|
||||
libs -lcurses -ltermcap -ledit -lgnuregex -lkvm -lz
|
@ -1,7 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
|
||||
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/MACHINE
|
||||
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
|
||||
srcdirs /usr/src/usr.sbin/pccard
|
||||
|
||||
progs sh find sed test rm
|
||||
|
@ -5,7 +5,6 @@
|
||||
|
||||
srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin
|
||||
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.bin/vi
|
||||
srcdirs /usr/src/sbin/MACHINE
|
||||
|
||||
# second, we list all the programs we want to include in our crunched binary.
|
||||
# The order doesn't matter. Any program that needs hard links to it gets an
|
||||
@ -18,7 +17,7 @@ progs mv rm rmdir sleep sync
|
||||
|
||||
# /sbin stuff
|
||||
|
||||
progs chown clri disklabel dmesg fdisk
|
||||
progs chown clri disklabel dmesg
|
||||
progs mknod mount reboot restore swapon umount
|
||||
|
||||
progs mount_msdos mount_cd9660
|
||||
|
@ -1,7 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
|
||||
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/MACHINE
|
||||
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
|
||||
srcdirs /usr/src/usr.sbin/pccard
|
||||
|
||||
progs sh find sed test rm
|
||||
|
38
release/i386/fixit_crunch.conf
Normal file
38
release/i386/fixit_crunch.conf
Normal file
@ -0,0 +1,38 @@
|
||||
# $FreeBSD$
|
||||
|
||||
# first, we list the source dirs that our programs reside in. These are
|
||||
# searched in order listed to find the dir containing each program.
|
||||
|
||||
srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin
|
||||
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.bin/vi
|
||||
srcdirs /usr/src/sbin/i386
|
||||
|
||||
# second, we list all the programs we want to include in our crunched binary.
|
||||
# The order doesn't matter. Any program that needs hard links to it gets an
|
||||
# `ln' directive.
|
||||
|
||||
# /bin stuff
|
||||
|
||||
progs cat chmod chroot cp dd df echo expr kill ln ls mkdir
|
||||
progs mv rm rmdir sleep sync
|
||||
|
||||
# /sbin stuff
|
||||
|
||||
progs chown clri disklabel dmesg fdisk
|
||||
progs mknod mount reboot restore swapon umount
|
||||
|
||||
progs mount_msdos mount_cd9660
|
||||
|
||||
ln restore rrestore
|
||||
ln chown chgrp
|
||||
|
||||
# /usr/bin stuff
|
||||
|
||||
progs ftp telnet vi grep
|
||||
ln vi view
|
||||
ln vi ex
|
||||
|
||||
# finally, we specify the libraries to link in with our binary
|
||||
|
||||
libs -lcrypt -ltelnet -lutil -ll -lm
|
||||
libs -lcurses -ltermcap -ledit -lgnuregex -lkvm -lz
|
@ -1,7 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
|
||||
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/MACHINE
|
||||
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
|
||||
srcdirs /usr/src/usr.sbin/pccard
|
||||
|
||||
progs sh find sed test rm
|
||||
|
38
release/pc98/fixit_crunch.conf
Normal file
38
release/pc98/fixit_crunch.conf
Normal file
@ -0,0 +1,38 @@
|
||||
# $FreeBSD$
|
||||
|
||||
# first, we list the source dirs that our programs reside in. These are
|
||||
# searched in order listed to find the dir containing each program.
|
||||
|
||||
srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin
|
||||
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.bin/vi
|
||||
srcdirs /usr/src/sbin/pc98
|
||||
|
||||
# second, we list all the programs we want to include in our crunched binary.
|
||||
# The order doesn't matter. Any program that needs hard links to it gets an
|
||||
# `ln' directive.
|
||||
|
||||
# /bin stuff
|
||||
|
||||
progs cat chmod chroot cp dd df echo expr kill ln ls mkdir
|
||||
progs mv rm rmdir sleep sync
|
||||
|
||||
# /sbin stuff
|
||||
|
||||
progs chown clri disklabel dmesg fdisk
|
||||
progs mknod mount reboot restore swapon umount
|
||||
|
||||
progs mount_msdos mount_cd9660
|
||||
|
||||
ln restore rrestore
|
||||
ln chown chgrp
|
||||
|
||||
# /usr/bin stuff
|
||||
|
||||
progs ftp telnet vi grep
|
||||
ln vi view
|
||||
ln vi ex
|
||||
|
||||
# finally, we specify the libraries to link in with our binary
|
||||
|
||||
libs -lcrypt -ltelnet -lutil -ll -lm
|
||||
libs -lcurses -ltermcap -ledit -lgnuregex -lkvm -lz
|
Loading…
Reference in New Issue
Block a user