diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 1 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_FAST_DEPEND | 5 | ||||
| -rw-r--r-- | tools/build/options/WITH_CCACHE_BUILD | 3 | ||||
| -rw-r--r-- | tools/build/options/WITH_FAST_DEPEND | 7 | ||||
| -rwxr-xr-x | tools/tinder.sh | 2 | ||||
| -rwxr-xr-x | tools/tools/nanobsd/defaults.sh | 30 | ||||
| -rwxr-xr-x | tools/tools/nanobsd/nanobsd.sh | 2 | ||||
| -rw-r--r-- | tools/tools/net80211/wlanstats/main.c | 4 | ||||
| -rw-r--r-- | tools/tools/net80211/wlanstats/wlanstats.c | 2 | ||||
| -rw-r--r-- | tools/tools/vt/setfont/Makefile | 6 | ||||
| -rw-r--r-- | tools/tools/vt/setfont/setfont.c | 89 |
11 files changed, 39 insertions, 112 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index eb9060d..326e543 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -8024,6 +8024,7 @@ OLD_FILES+=usr/share/examples/libusb20/control.c OLD_FILES+=usr/share/examples/libusb20/util.c OLD_FILES+=usr/share/examples/libusb20/util.h OLD_DIRS+=usr/share/examples/libusb20 +OLD_FILES+=usr/share/firmware/ar5523.bin OLD_FILES+=usr/share/man/man1/uhsoctl.1.gz OLD_FILES+=usr/share/man/man1/usbhidaction.1.gz OLD_FILES+=usr/share/man/man1/usbhidctl.1.gz diff --git a/tools/build/options/WITHOUT_FAST_DEPEND b/tools/build/options/WITHOUT_FAST_DEPEND deleted file mode 100644 index 2e6ca44..0000000 --- a/tools/build/options/WITHOUT_FAST_DEPEND +++ /dev/null @@ -1,5 +0,0 @@ -.\" $FreeBSD$ -Set to use the historical -.Xr mkdep 1 -for the "make depend" phase of the build. -This option is deprecated and will be removed soon. diff --git a/tools/build/options/WITH_CCACHE_BUILD b/tools/build/options/WITH_CCACHE_BUILD index 4e29c9a..86b7f1a 100644 --- a/tools/build/options/WITH_CCACHE_BUILD +++ b/tools/build/options/WITH_CCACHE_BUILD @@ -24,9 +24,6 @@ when using an external compiler. The .Sy CCACHE_CPP2 option is used for Clang but not GCC. -ccache works best when combined with the -.Sy WITH_FAST_DEPEND -option. .Pp Sharing a cache between multiple work directories requires using a layout similar to diff --git a/tools/build/options/WITH_FAST_DEPEND b/tools/build/options/WITH_FAST_DEPEND deleted file mode 100644 index 2597a36..0000000 --- a/tools/build/options/WITH_FAST_DEPEND +++ /dev/null @@ -1,7 +0,0 @@ -.\" $FreeBSD$ -Set to generate -.Sy .depend -files in the build during compilation instead of the -historial -.Xr mkdep 1 -call during the "make depend" phase. diff --git a/tools/tinder.sh b/tools/tinder.sh index 4291e88..aaca7c8 100755 --- a/tools/tinder.sh +++ b/tools/tinder.sh @@ -58,4 +58,4 @@ for i in "$@"; do ;; esac done -make tinderbox UNIVERSE_TARGET="_cleanobj _obj _depend everything" $MAKE_ARGS SUBDIR_OVERRIDE="$SUBDIR" +make tinderbox UNIVERSE_TARGET="_cleanobj _obj everything" $MAKE_ARGS SUBDIR_OVERRIDE="$SUBDIR" diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 9a5c5cb..cb7a2d1 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -83,6 +83,9 @@ NANO_KERNEL=GENERIC # Use "default" to install all built modules. NANO_MODULES= +# Early customize commands. +NANO_EARLY_CUSTOMIZE="" + # Customize commands. NANO_CUSTOMIZE="" @@ -450,6 +453,22 @@ native_xtools ( ) ( ) # +# Run the requested set of early customization scripts, run before +# buildworld. +# +run_early_customize() { + + pprint 2 "run early customize scripts" + for c in $NANO_EARLY_CUSTOMIZE + do + pprint 2 "early customize \"$c\"" + pprint 3 "log: ${NANO_LOG}/_.early_cust.$c" + pprint 4 "`type $c`" + { set -x ; $c ; set +x ; } >${NANO_LOG}/_.early_cust.$c 2>&1 + done +} + +# # Run the requested set of customization scripts, run after we've # done an installworld, installed the etc files, installed the kernel # and tweaked them in the standard way. @@ -916,7 +935,7 @@ cust_pkgng ( ) ( mkdir -p ${NANO_WORLDDIR}/Pkg ( cd "${NANO_PACKAGE_DIR}" - find "${NANO_PACKAGE_LIST}" -print | + find ${NANO_PACKAGE_LIST} -print | cpio -Ldumpv ${NANO_WORLDDIR}/Pkg ) @@ -961,6 +980,15 @@ cust_pkgng ( ) ( ####################################################################### # Convenience function: +# Register all args as early customize function to run just before +# build commences. + +early_customize_cmd () { + NANO_EARLY_CUSTOMIZE="$NANO_EARLY_CUSTOMIZE $*" +} + +####################################################################### +# Convenience function: # Register all args as customize function. customize_cmd ( ) { diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh index a17db7a..f140a76 100755 --- a/tools/tools/nanobsd/nanobsd.sh +++ b/tools/tools/nanobsd/nanobsd.sh @@ -139,6 +139,8 @@ fi pprint 1 "NanoBSD image ${NANO_NAME} build starting" +run_early_customize + if $do_world ; then if $do_clean ; then clean_build diff --git a/tools/tools/net80211/wlanstats/main.c b/tools/tools/net80211/wlanstats/main.c index 34d939f..5716d4b 100644 --- a/tools/tools/net80211/wlanstats/main.c +++ b/tools/tools/net80211/wlanstats/main.c @@ -61,6 +61,10 @@ static struct { "ampdu_drop,ampdu_bar,ampdu_baroow,ampdu_barmove,ampdu_bartx," "ampdu_bartxfail,ampdu_bartxretry,rssi,rate" }, + { + "amsdu", + "input,output,amsdu_tooshort,amsdu_split,amsdu_decap,amsdu_encap,rssi,rate" + }, }; static const char * diff --git a/tools/tools/net80211/wlanstats/wlanstats.c b/tools/tools/net80211/wlanstats/wlanstats.c index ef83470..50c86fc 100644 --- a/tools/tools/net80211/wlanstats/wlanstats.c +++ b/tools/tools/net80211/wlanstats/wlanstats.c @@ -767,6 +767,7 @@ wlan_get_curstat(struct bsdstat *sf, int s, char b[], size_t bs) case S_FF_SPLIT: STAT(ff_split); case S_FF_DECAP: STAT(ff_decap); case S_FF_ENCAP: STAT(ff_encap); + case S_FF_ENCAPFAIL: STAT(ff_encapfail); case S_RX_BADBINTVAL: STAT(rx_badbintval); case S_RX_MGMT: STAT(rx_mgmt); case S_RX_DEMICFAIL: STAT(rx_demicfail); @@ -929,6 +930,7 @@ wlan_get_totstat(struct bsdstat *sf, int s, char b[], size_t bs) case S_FF_SPLIT: STAT(ff_split); case S_FF_DECAP: STAT(ff_decap); case S_FF_ENCAP: STAT(ff_encap); + case S_FF_ENCAPFAIL: STAT(ff_encapfail); case S_RX_BADBINTVAL: STAT(rx_badbintval); case S_RX_MGMT: STAT(rx_mgmt); case S_RX_DEMICFAIL: STAT(rx_demicfail); diff --git a/tools/tools/vt/setfont/Makefile b/tools/tools/vt/setfont/Makefile deleted file mode 100644 index a242d51..0000000 --- a/tools/tools/vt/setfont/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -PROG= setfont -MAN1= - -WARNS?= 6 - -.include <bsd.prog.mk> diff --git a/tools/tools/vt/setfont/setfont.c b/tools/tools/vt/setfont/setfont.c deleted file mode 100644 index 127fad3..0000000 --- a/tools/tools/vt/setfont/setfont.c +++ /dev/null @@ -1,89 +0,0 @@ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -#include <sys/consio.h> -#include <sys/endian.h> -#include <sys/ioctl.h> -#include <sys/param.h> - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -struct file_header { - uint8_t magic[8]; - uint8_t width; - uint8_t height; - uint16_t pad; - uint32_t glyph_count; - uint32_t map_count[4]; -} __packed; - -static vfnt_map_t * -load_mappingtable(unsigned int nmappings) -{ - vfnt_map_t *t; - unsigned int i; - - if (nmappings == 0) - return (NULL); - - t = malloc(sizeof *t * nmappings); - - if (fread(t, sizeof *t * nmappings, 1, stdin) != 1) { - perror("mappings"); - exit(1); - } - - for (i = 0; i < nmappings; i++) { - t[i].src = be32toh(t[i].src); - t[i].dst = be16toh(t[i].dst); - t[i].len = be16toh(t[i].len); - } - - return (t); -} - -int -main(int argc __unused, char *argv[] __unused) -{ - struct file_header fh; - static vfnt_t vfnt; - size_t glyphsize; - unsigned int i; - - if (fread(&fh, sizeof fh, 1, stdin) != 1) { - perror("file_header"); - return (1); - } - - if (memcmp(fh.magic, "VFNT0002", 8) != 0) { - fprintf(stderr, "Bad magic\n"); - return (1); - } - - for (i = 0; i < VFNT_MAPS; i++) - vfnt.map_count[i] = be32toh(fh.map_count[i]); - vfnt.glyph_count = be32toh(fh.glyph_count); - vfnt.width = fh.width; - vfnt.height = fh.height; - - glyphsize = howmany(vfnt.width, 8) * vfnt.height * vfnt.glyph_count; - vfnt.glyphs = malloc(glyphsize); - - if (fread(vfnt.glyphs, glyphsize, 1, stdin) != 1) { - perror("glyphs"); - return (1); - } - - for (i = 0; i < VFNT_MAPS; i++) - vfnt.map[i] = load_mappingtable(vfnt.map_count[i]); - - if (ioctl(STDOUT_FILENO, PIO_VFONT, &vfnt) == -1) { - perror("PIO_VFONT"); - return (1); - } - - return (0); -} |
