diff --git a/tools/tools/nanobsd/pcengines/ALIX_DSK b/tools/tools/nanobsd/pcengines/ALIX_DSK index e11f7de4f2f4..f82bbfbd85d8 100644 --- a/tools/tools/nanobsd/pcengines/ALIX_DSK +++ b/tools/tools/nanobsd/pcengines/ALIX_DSK @@ -1,113 +1,114 @@ # # $FreeBSD$ # cpu I586_CPU ident ALIX_DSK -makeoptions DEBUG=-g +makeoptions DEBUG=-g options CPU_GEODE -options SCHED_ULE -options PREEMPTION -options INET -options INET6 -options FFS -options SOFTUPDATES -options UFS_ACL -options UFS_DIRHASH +options SCHED_ULE +options PREEMPTION +options INET +options INET6 +options FFS +options SOFTUPDATES +options UFS_ACL +options UFS_DIRHASH options NFSCL # Network Filesystem Client -options NFSLOCKD -options MSDOSFS -options CD9660 -options PROCFS -options PSEUDOFS -options GEOM_PART_GPT -options GEOM_LABEL -options COMPAT_43TTY +options NFSLOCKD +options MSDOSFS +options CD9660 +options PROCFS +options PSEUDOFS +options GEOM_PART_GPT +options GEOM_LABEL +options COMPAT_43TTY options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options COMPAT_FREEBSD6 # Compatible with FreeBSD6 options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options COMPAT_FREEBSD9 # Compatible with FreeBSD9 options COMPAT_FREEBSD10 # Compatible with FreeBSD10 -options SCSI_DELAY=5000 -options SYSVSHM -options SYSVMSG -options SYSVSEM -options P1003_1B_SEMAPHORES +options COMPAT_FREEBSD11 # Compatible with FreeBSD11 +options COMPAT_FREEBSD12 # Compatible with FreeBSD12 +options SCSI_DELAY=5000 +options SYSVSHM +options SYSVMSG +options SYSVSEM +options P1003_1B_SEMAPHORES options _KPOSIX_PRIORITY_SCHEDULING -options PRINTF_BUFR_SIZE=128 -device apic +options PRINTF_BUFR_SIZE=128 +device apic device cpufreq device acpi device pci device fdc device ata -options ATA_STATIC_ID -device scbus -device da -device sa -device cd -device pass -device uart -device em -device miibus -device vr -device wlan -options IEEE80211_DEBUG -options IEEE80211_SUPPORT_MESH -device wlan_wep -device wlan_ccmp -device wlan_tkip -device wlan_amrr -device an -device ath -device ath_hal -device ath_rate_sample -device wi -device loop -device ether -device tun -device pty -device md -device gif -device firmware -device bpf -device uhci -device ohci -device ehci -device usb -device ulpt -device umass -device u3g -device ubsa -device uftdi +options ATA_STATIC_ID +device scbus +device da +device sa +device cd +device pass +device uart +device iflib +device em +device miibus +device vr +device wlan +options IEEE80211_DEBUG +options IEEE80211_SUPPORT_MESH +device wlan_wep +device wlan_ccmp +device wlan_tkip +device wlan_amrr +device ath +device ath_hal +device ath_rate_sample +device loop +device ether +device tuntap +device pty +device md +device gif +device firmware +device bpf +device uhci +device ohci +device ehci +device usb +device ulpt +device umass +device u3g +device ubsa +device uftdi options INCLUDE_CONFIG_FILE options ALTQ options ALTQ_CBQ options ALTQ_RED options ALTQ_RIO options ALTQ_HFSC options ALTQ_CDNR options ALTQ_PRIQ device pf device pflog device pfsync device carp device if_bridge options DEVICE_POLLING options NETGRAPH options NETGRAPH_BPF options NETGRAPH_ETHER options NETGRAPH_IFACE options NETGRAPH_PPP options NETGRAPH_PPPOE options NETGRAPH_PPTPGRE options NETGRAPH_MPPC_ENCRYPTION options NETGRAPH_SOCKET options NETGRAPH_KSOCKET options NETGRAPH_VJC diff --git a/tools/tools/nanobsd/pcengines/common.conf b/tools/tools/nanobsd/pcengines/common.conf index 8cd870b2dd7d..632ace1841cc 100644 --- a/tools/tools/nanobsd/pcengines/common.conf +++ b/tools/tools/nanobsd/pcengines/common.conf @@ -1,83 +1,82 @@ # # $FreeBSD$ # NANO_SRC=$(pwd) NANO_SRC=${NANO_SRC%/tools/tools/nanobsd/pcengines} -NANO_OBJ=${NANO_SRC}/../${NANO_NAME}/obj +NANO_OBJ=${NANO_SRC}/../nanobsd-builds/${NANO_NAME}/obj NANO_TOOLS=$(pwd) NANO_PACKAGE_DIR=$(pwd)/Pkg #NANO_RAM_TMPVARSIZE=20480 #NANO_RAM_TMPVARSIZE=30720 NANO_RAM_TMPVARSIZE=40960 -NANO_PMAKE="make -j 8" NANO_MD_BACKING="swap" # Options to put in make.conf during buildworld only CONF_BUILD=' NO_CLEAN=YES ' # Options to put in make.conf during installworld only CONF_INSTALL=' ' # Options to put in make.conf during both build- & installworld. CONF_WORLD=' CFLAGS=-O -pipe WITHOUT_ACPI= WITHOUT_TESTS= MODULES_OVERRIDE=netgraph rc4 BOOT_PXELDR_PROBE_KEYBOARD=1 BOOT_PXELDR_ALWAYS_SERIAL=1 BOOT_COMCONSOLE_SPEED=9600 ' customize_cmd cust_comconsole customize_cmd cust_allow_ssh_root customize_cmd cust_install_files cust_install_machine_files() ( MACHINE_DIR="${NANO_TOOLS}/Files.${NANO_NAME}" if [ -d "${MACHINE_DIR}" ]; then cd ${MACHINE_DIR} find . -print | grep -Ev '/(CVS|\.git|\.hg|\.svn)' | cpio -dumpv ${NANO_WORLDDIR} else echo "${MACHINE_DIR} not found, skipping step" fi ) customize_cmd cust_install_machine_files cust_ld32_cfg () ( cd ${NANO_WORLDDIR}/libexec if [ \! -f ld-elf32.so.1 ]; then ln -s ld-elf.so.1 ld-elf32.so.1 fi ) customize_cmd cust_ld32_cfg cust_boot_cfg () ( cd ${NANO_WORLDDIR} echo "-S9600 -h" > boot.config echo "console=\"comconsole\"" > boot/loader.conf echo "comconsole_speed=\"9600\"" >> boot/loader.conf echo "hint.acpi.0.disabled=\"1\"" >> boot/loader.conf ) customize_cmd cust_boot_cfg customize_cmd cust_pkgng cust_etc_cfg () ( cd ${NANO_WORLDDIR} mkdir -pv z/scratch echo "fs:/usr/ports /usr/ports nfs rw,noauto,noatime,bg,soft,intr,nfsv3 0 0" >> etc/fstab echo "fs:/mnt/Backup /mnt/Backup nfs rw,noauto,noatime,bg,soft,intr,nfsv3 0 0" >> etc/fstab echo "fs:/mnt/Ablage /mnt/Ablage nfs rw,noauto,noatime,bg,soft,intr,nfsv3 0 0" >> etc/fstab echo "/dev/ad1s1a /z/scratch ufs rw,noauto,noatime 0 0" >> etc/fstab ) customize_cmd cust_etc_cfg last_orders () ( pprint 2 "last orders" ( cd ${NANO_WORLDDIR} touch conf/default/etc/.keepme touch conf/default/var/.keepme ) )