Skip to content
Browse files

Removed referenses to list.largekernel since it has been merged into …

…normal list
  • Loading branch information...
1 parent 88de8eb commit dc9ea687b7610b3ad54006bd488712843921d5cf rancor committed Sep 25, 2011
Showing with 45 additions and 58 deletions.
  1. +0 −10 Makefile
  2. +1 −1 build-kernel-injail.sh
  3. +1 −2 build-kernel.sh
  4. +1 −1 build-livecd-injail.sh
  5. +1 −2 build-livecd.sh
  6. +1 −1 build-usbkernel-injail.sh
  7. +1 −2 build-usbkernel.sh
  8. +39 −0 list
  9. +0 −39 list.largekernel
View
10 Makefile
@@ -15,21 +15,11 @@ TTYSPEED= 19200
TTYSPEED= 38400
.endif
-# WRAP has an even sillier default console speed than Soekris :)
-.if ${KCONF} == "WRAP12.LARGE"
-TTYSPEED= 38400
-.endif
-
# Change the default conspeed of Generic to 9600
.if ${KCONF} == "GENERIC-RD"
TTYSPEED= 9600
.endif
-# Change the default conspeed of Generic to 9600
-.if ${KCONF} == "GENERIC-RD.LARGE"
-TTYSPEED= 9600
-.endif
-
.include <bsd.own.mk>
# Build options
View
2 build-kernel-injail.sh
@@ -4,7 +4,7 @@
mkdir -p obj
# Create a templist
-cat list list.largekernel > list.temp
+cat list > list.temp
# Include custom list if exist
if [ -r list.custom ]; then
cat list.custom >> list.temp
View
3 build-kernel.sh
@@ -30,7 +30,7 @@ if ! [ -d ${CWD}/${WORKDIR}/dev ]; then
fi
# Which kernel to use?
-export KERNEL=$1.LARGE
+export KERNEL=$1
# Create the kernelfile (with increased MINIROOTSIZE)
grep -v MINIROOTSIZE $1 > ${CWD}/${WORKDIR}/${KERNEL}
@@ -47,7 +47,6 @@ cp -p ${CWD}/$1 ${CWD}/${WORKDIR}/
cp -p ${CWD}/Makefile ${CWD}/${WORKDIR}/
cp -p ${CWD}/build-kernel-injail.sh ${CWD}/${WORKDIR}/
cp -p ${CWD}/list ${CWD}/${WORKDIR}/
-cp -p ${CWD}/list.largekernel ${CWD}/${WORKDIR}/
cp -p ${CWD}/list.recovery ${CWD}/${WORKDIR}/
# Include custom list if exist
if [ -r ${CWD}/list.custom ]; then
View
2 build-livecd-injail.sh
@@ -4,7 +4,7 @@
mkdir -p obj
# Create a templist
-cat list list.largekernel > list.temp
+cat list > list.temp
# Include custom list if exist
if [ -r list.custom ]; then
cat list.custom >> list.temp
View
3 build-livecd.sh
@@ -30,7 +30,7 @@ if ! [ -d ${CWD}/${WORKDIR}/dev ]; then
fi
# Which kernel to use?
-export KERNEL=$1.LARGE
+export KERNEL=$1
# Create the kernelfile (with increased MINIROOTSIZE)
grep -v MINIROOTSIZE $1 > ${CWD}/${WORKDIR}/${KERNEL}
@@ -47,7 +47,6 @@ cp -p ${CWD}/$1 ${CWD}/${WORKDIR}/
cp -p ${CWD}/Makefile ${CWD}/${WORKDIR}/
cp -p ${CWD}/build-livecd-injail.sh ${CWD}/${WORKDIR}/
cp -p ${CWD}/list ${CWD}/${WORKDIR}/
-cp -p ${CWD}/list.largekernel ${CWD}/${WORKDIR}/
cp -p ${CWD}/list.recovery ${CWD}/${WORKDIR}/
# Include custom list if exist
if [ -r ${CWD}/list.custom ]; then
View
2 build-usbkernel-injail.sh
@@ -4,7 +4,7 @@
mkdir -p obj
# Create a templist
-cat list list.largekernel > list.temp
+cat list > list.temp
# Modify list.temp to use fstab.initial.usb and
# add mount_cd9660.
View
3 build-usbkernel.sh
@@ -30,7 +30,7 @@ if ! [ -d ${CWD}/${WORKDIR}/dev ]; then
fi
# Which kernel to use?
-export KERNEL=$1.LARGE
+export KERNEL=$1
# Create the kernelfile (with increased MINIROOTSIZE)
grep -v MINIROOTSIZE $1 > ${CWD}/${WORKDIR}/${KERNEL}
@@ -47,7 +47,6 @@ cp -p ${CWD}/$1 ${CWD}/${WORKDIR}/
cp -p ${CWD}/Makefile ${CWD}/${WORKDIR}/
cp -p ${CWD}/build-usbkernel-injail.sh ${CWD}/${WORKDIR}/
cp -p ${CWD}/list ${CWD}/${WORKDIR}/
-cp -p ${CWD}/list.largekernel ${CWD}/${WORKDIR}/
cp -p ${CWD}/list.recovery ${CWD}/${WORKDIR}/
cp -p ${CWD}/conf ${CWD}/${WORKDIR}/
cp -p ${CWD}/mtree.conf ${CWD}/${WORKDIR}/
View
39 list
@@ -315,3 +315,42 @@ SPECIAL kvm_mkdb -vo ./var/db ${OBJDIR}/bsd
# Generate flashboot.mtree without time, used when making backups
SPECIAL mtree -s2121 -x -c -k mode,nlink,size,link,cksum -p ./ > etc/flashboot.mtree
+# Bellow this entry is the extention of the old large kernel modification, known as list.largekerneL
+
+COPY ${DESTDIR}/var/named/etc/named.conf var/named/etc/named.conf
+COPY ${DESTDIR}/var/named/standard/localhost var/named/standard/localhost
+COPY ${DESTDIR}/var/named/standard/loopback var/named/standard/loopback
+COPY ${DESTDIR}/var/named/standard/loopback6.arpa var/named/standard/loopback6.arpa
+COPY ${DESTDIR}/var/named/etc/root.hint var/named/etc/root.hint
+
+COPY ${DESTDIR}/usr/sbin/named usr/sbin/named
+COPY ${DESTDIR}/usr/sbin/rndc usr/sbin/rndc
+COPY ${DESTDIR}/usr/sbin/rndc-confgen usr/sbin/rndc-confgen
+COPY ${DESTDIR}/usr/sbin/dig usr/sbin/dig
+
+COPY ${DESTDIR}/usr/bin/ldd usr/bin/ldd
+
+#COPY ${DESTDIR}/usr/sbin/portmap usr/sbin/portmap
+#COPY ${DESTDIR}/usr/sbin/rarpd usr/sbin/rarpd
+#COPY ${DESTDIR}/usr/sbin/rpc.bootparamd usr/sbin/rpc.bootparamd
+
+COPY ${DESTDIR}/sbin/mount_msdos sbin/mount_msdos
+COPY ${DESTDIR}/sbin/kbd sbin/kbd
+
+# Copy dynamic libs
+SPECIAL sh ${CURDIR}/tools/libcopy.sh ${DESTDIR} ./usr/lib sbin/*
+SPECIAL sh ${CURDIR}/tools/libcopy.sh ${DESTDIR} ./usr/lib usr/bin/*
+SPECIAL sh ${CURDIR}/tools/libcopy.sh ${DESTDIR} ./usr/lib usr/sbin/*
+
+# Copy extra dynamic libs
+SPECIAL sh ${CURDIR}/tools/wantlibcopy.sh ${DESTDIR} ./usr/lib pthread ssl kvm wrap
+
+# Make some devices needed by largekernel
+SPECIAL cd dev; ./MAKEDEV arandom
+
+# Create mountpoint for cdrom
+SPECIAL mkdir ./cd
+
+# Generate flashboot.mtree again.
+SPECIAL mtree -s2121 -x -c -k mode,nlink,size,link,cksum -p ./ > etc/flashboot.mtree
+
View
39 list.largekernel
@@ -1,39 +0,0 @@
-# This list is added on top of the existing list for the large kernel
-
-COPY ${DESTDIR}/var/named/etc/named.conf var/named/etc/named.conf
-COPY ${DESTDIR}/var/named/standard/localhost var/named/standard/localhost
-COPY ${DESTDIR}/var/named/standard/loopback var/named/standard/loopback
-COPY ${DESTDIR}/var/named/standard/loopback6.arpa var/named/standard/loopback6.arpa
-COPY ${DESTDIR}/var/named/etc/root.hint var/named/etc/root.hint
-
-COPY ${DESTDIR}/usr/sbin/named usr/sbin/named
-COPY ${DESTDIR}/usr/sbin/rndc usr/sbin/rndc
-COPY ${DESTDIR}/usr/sbin/rndc-confgen usr/sbin/rndc-confgen
-COPY ${DESTDIR}/usr/sbin/dig usr/sbin/dig
-
-COPY ${DESTDIR}/usr/bin/ldd usr/bin/ldd
-
-#COPY ${DESTDIR}/usr/sbin/portmap usr/sbin/portmap
-#COPY ${DESTDIR}/usr/sbin/rarpd usr/sbin/rarpd
-#COPY ${DESTDIR}/usr/sbin/rpc.bootparamd usr/sbin/rpc.bootparamd
-
-COPY ${DESTDIR}/sbin/mount_msdos sbin/mount_msdos
-COPY ${DESTDIR}/sbin/kbd sbin/kbd
-
-# Copy dynamic libs
-SPECIAL sh ${CURDIR}/tools/libcopy.sh ${DESTDIR} ./usr/lib sbin/*
-SPECIAL sh ${CURDIR}/tools/libcopy.sh ${DESTDIR} ./usr/lib usr/bin/*
-SPECIAL sh ${CURDIR}/tools/libcopy.sh ${DESTDIR} ./usr/lib usr/sbin/*
-
-# Copy extra dynamic libs
-SPECIAL sh ${CURDIR}/tools/wantlibcopy.sh ${DESTDIR} ./usr/lib pthread ssl kvm wrap
-
-# Make some devices needed by largekernel
-SPECIAL cd dev; ./MAKEDEV arandom
-
-# Create mountpoint for cdrom
-SPECIAL mkdir ./cd
-
-# Generate flashboot.mtree again.
-SPECIAL mtree -s2121 -x -c -k mode,nlink,size,link,cksum -p ./ > etc/flashboot.mtree
-

0 comments on commit dc9ea68

Please sign in to comment.
Something went wrong with that request. Please try again.