Date: Sun, 6 Jan 2019 02:15:09 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r342808 - in stable/11: . contrib/mdocml lib lib/libbe sbin sbin/bectl share/mk sys/amd64/conf tools/build/mk usr.sbin/config Message-ID: <201901060215.x062F9ak082101@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Sun Jan 6 02:15:09 2019 New Revision: 342808 URL: https://svnweb.freebsd.org/changeset/base/342808 Log: Revert r342807, mistakenly including libbe(3)/bectl(8) MFC Deleted: stable/11/lib/libbe/ stable/11/sbin/bectl/ Modified: stable/11/Makefile.inc1 stable/11/ObsoleteFiles.inc stable/11/contrib/mdocml/lib.in stable/11/lib/Makefile stable/11/sbin/Makefile stable/11/share/mk/bsd.libnames.mk stable/11/share/mk/src.libnames.mk stable/11/sys/amd64/conf/GENERIC stable/11/sys/amd64/conf/MINIMAL stable/11/tools/build/mk/OptionalObsoleteFiles.inc stable/11/usr.sbin/config/config.y Directory Properties: stable/11/ (props changed) Modified: stable/11/Makefile.inc1 ============================================================================== --- stable/11/Makefile.inc1 Sun Jan 6 02:13:16 2019 (r342807) +++ stable/11/Makefile.inc1 Sun Jan 6 02:15:09 2019 (r342808) @@ -2144,7 +2144,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ ${_cddl_lib_libuutil} \ ${_cddl_lib_libavl} \ - ${_cddl_lib_libzfs_core} ${_cddl_lib_libzfs} \ + ${_cddl_lib_libzfs_core} \ ${_cddl_lib_libctf} \ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_lib_libldns} \ @@ -2213,15 +2213,7 @@ _cddl_lib_libavl= cddl/lib/libavl _cddl_lib_libuutil= cddl/lib/libuutil .if ${MK_ZFS} != "no" _cddl_lib_libzfs_core= cddl/lib/libzfs_core -_cddl_lib_libzfs= cddl/lib/libzfs - cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L - -cddl/lib/libzfs__L: cddl/lib/libzfs_core__L lib/msun__L lib/libutil__L -cddl/lib/libzfs__L: lib/libthr__L lib/libmd__L lib/libz__L cddl/lib/libumem__L -cddl/lib/libzfs__L: cddl/lib/libuutil__L cddl/lib/libavl__L lib/libgeom__L - -lib/libbe__L: cddl/lib/libzfs__L .endif _cddl_lib_libctf= cddl/lib/libctf _cddl_lib= cddl/lib Modified: stable/11/ObsoleteFiles.inc ============================================================================== --- stable/11/ObsoleteFiles.inc Sun Jan 6 02:13:16 2019 (r342807) +++ stable/11/ObsoleteFiles.inc Sun Jan 6 02:15:09 2019 (r342808) @@ -38,8 +38,6 @@ # xargs -n1 | sort | uniq -d; # done -# 20181115: libbe(3) SHLIBDIR fixed to reflect correct location -OLD_LIBS+=usr/lib/libbe.so.1 # 20180812: move of libmlx5.so.1 and libibverbs.so.1 OLD_LIBS+=usr/lib/libmlx5.so.1 OLD_LIBS+=usr/lib/libibverbs.so.1 Modified: stable/11/contrib/mdocml/lib.in ============================================================================== --- stable/11/contrib/mdocml/lib.in Sun Jan 6 02:13:16 2019 (r342807) +++ stable/11/contrib/mdocml/lib.in Sun Jan 6 02:15:09 2019 (r342808) @@ -28,7 +28,6 @@ LINE("lib80211", "802.11 Wireless Network Management L LINE("libarchive", "Streaming Archive Library (libarchive, \\-larchive)") LINE("libarm", "ARM Architecture Library (libarm, \\-larm)") LINE("libarm32", "ARM32 Architecture Library (libarm32, \\-larm32)") -LINE("libbe", "Boot Environment Library (libbe, \\-lbe)") LINE("libbluetooth", "Bluetooth Library (libbluetooth, \\-lbluetooth)") LINE("libbsm", "Basic Security Module Library (libbsm, \\-lbsm)") LINE("libc", "Standard C\\~Library (libc, \\-lc)") Modified: stable/11/lib/Makefile ============================================================================== --- stable/11/lib/Makefile Sun Jan 6 02:13:16 2019 (r342807) +++ stable/11/lib/Makefile Sun Jan 6 02:15:09 2019 (r342808) @@ -289,7 +289,6 @@ _libproc= libproc _librtld_db= librtld_db .endif SUBDIR.${MK_OFED}+= ofed -SUBDIR.${MK_ZFS}+= libbe .if ${MK_OPENSSL} != "no" _libmp= libmp Modified: stable/11/sbin/Makefile ============================================================================== --- stable/11/sbin/Makefile Sun Jan 6 02:13:16 2019 (r342807) +++ stable/11/sbin/Makefile Sun Jan 6 02:15:09 2019 (r342808) @@ -87,7 +87,6 @@ SUBDIR.${MK_PF}+= pfctl SUBDIR.${MK_PF}+= pflogd SUBDIR.${MK_QUOTAS}+= quotacheck SUBDIR.${MK_ROUTED}+= routed -SUBDIR.${MK_ZFS}+= bectl SUBDIR.${MK_ZFS}+= zfsbootcfg SUBDIR.${MK_TESTS}+= tests Modified: stable/11/share/mk/bsd.libnames.mk ============================================================================== --- stable/11/share/mk/bsd.libnames.mk Sun Jan 6 02:13:16 2019 (r342807) +++ stable/11/share/mk/bsd.libnames.mk Sun Jan 6 02:15:09 2019 (r342808) @@ -21,7 +21,6 @@ LIBASN1?= ${DESTDIR}${LIBDIR_BASE}/libasn1.a LIBATM?= ${DESTDIR}${LIBDIR_BASE}/libatm.a LIBAUDITD?= ${DESTDIR}${LIBDIR_BASE}/libauditd.a LIBAVL?= ${DESTDIR}${LIBDIR_BASE}/libavl.a -LIBBE?= ${DESTDIR}${LIBDIR_BASE}/libbe.a LIBBEGEMOT?= ${DESTDIR}${LIBDIR_BASE}/libbegemot.a LIBBLACKLIST?= ${DESTDIR}${LIBDIR_BASE}/libblacklist.a LIBBLUETOOTH?= ${DESTDIR}${LIBDIR_BASE}/libbluetooth.a Modified: stable/11/share/mk/src.libnames.mk ============================================================================== --- stable/11/share/mk/src.libnames.mk Sun Jan 6 02:13:16 2019 (r342807) +++ stable/11/share/mk/src.libnames.mk Sun Jan 6 02:15:09 2019 (r342808) @@ -59,7 +59,6 @@ _LIBRARIES= \ asn1 \ auditd \ avl \ - be \ begemot \ bluetooth \ bsdxml \ @@ -327,7 +326,6 @@ _DP_zfs= md pthread umem util uutil m nvpair avl bsdxm zfs_core _DP_zfs_core= nvpair _DP_zpool= md pthread z nvpair avl umem -_DP_be= zfs nvpair # OFED support .if ${MK_OFED} != "no" @@ -467,8 +465,6 @@ LIBBSNMPTOOLS?= ${LIBBSNMPTOOLSDIR}/libbsnmptools.a LIBAMUDIR= ${OBJTOP}/usr.sbin/amd/libamu LIBAMU?= ${LIBAMUDIR}/libamu.a - -LIBBE?= ${LIBBEDIR}/libbe.a # Define a directory for each library. This is useful for adding -L in when # not using a --sysroot or for meta mode bootstrapping when there is no Modified: stable/11/sys/amd64/conf/GENERIC ============================================================================== --- stable/11/sys/amd64/conf/GENERIC Sun Jan 6 02:13:16 2019 (r342807) +++ stable/11/sys/amd64/conf/GENERIC Sun Jan 6 02:15:09 2019 (r342808) @@ -21,47 +21,6 @@ cpu HAMMER ident GENERIC -envvar static_env_included=1 -envvar boot_serial=1 -envvar console=userboot -envvar currdev=disk0s2a: -envvar vfs.root.mountfrom=ufs:vtbd0s2a -envvar loader_env.disabled=0 -envvar vfs.mountroot.timeout=3 -envvar hint.acpi_throttle.0.disabled=1 -envvar hint.atkbd.0.at=atkbdc -envvar hint.atkbd.0.irq=1 -envvar hint.atkbdc.0.at=isa -envvar hint.atkbdc.0.port=0x060 -envvar hint.atrtc.0.at=isa -envvar hint.atrtc.0.irq=8 -envvar hint.atrtc.0.port=0x70 -envvar hint.attimer.0.at=isa -envvar hint.attimer.0.irq=0 -envvar hint.attimer.0.port=0x40 -envvar hint.fd.0.at=fdc0 -envvar hint.fd.0.drive=0 -envvar hint.fd.1.at=fdc0 -envvar hint.fd.1.drive=1 -envvar hint.fdc.0.at=isa -envvar hint.fdc.0.drq=2 -envvar hint.fdc.0.irq=6 -envvar hint.fdc.0.port=0x3F0 -envvar hint.p4tcc.0.disabled=1 -envvar hint.ppc.0.at=isa -envvar hint.ppc.0.irq=7 -envvar hint.psm.0.at=atkbdc -envvar hint.psm.0.irq=12 -envvar hint.sc.0.at=isa -envvar hint.sc.0.flags=0x100 -envvar hint.uart.0.at=isa -envvar hint.uart.0.flags=0x10 -envvar hint.uart.0.irq=4 -envvar hint.uart.0.port=0x3F8 - -hints "hints.kyle" - - makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support Modified: stable/11/sys/amd64/conf/MINIMAL ============================================================================== --- stable/11/sys/amd64/conf/MINIMAL Sun Jan 6 02:13:16 2019 (r342807) +++ stable/11/sys/amd64/conf/MINIMAL Sun Jan 6 02:15:09 2019 (r342808) @@ -35,9 +35,6 @@ cpu HAMMER ident MINIMAL -envvar static_env_included=1 -hints "hints.kyle" - makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/11/tools/build/mk/OptionalObsoleteFiles.inc Sun Jan 6 02:13:16 2019 (r342807) +++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc Sun Jan 6 02:15:09 2019 (r342808) @@ -1330,7 +1330,7 @@ OLD_FILES+=usr/bin/ztest OLD_FILES+=usr/lib/libbe.a OLD_FILES+=usr/lib/libbe_p.a OLD_FILES+=usr/lib/libbe.so -OLD_LIBS+=lib/libbe.so.1 +OLD_LIBS+=usr/lib/libbe.so.1 OLD_FILES+=usr/lib/libzfs.a OLD_LIBS+=usr/lib/libzfs.so OLD_FILES+=usr/lib/libzfs_core.a Modified: stable/11/usr.sbin/config/config.y ============================================================================== --- stable/11/usr.sbin/config/config.y Sun Jan 6 02:13:16 2019 (r342807) +++ stable/11/usr.sbin/config/config.y Sun Jan 6 02:15:09 2019 (r342808) @@ -97,7 +97,7 @@ static void newdev(char *name); static void newfile(char *name); static void newenvvar(char *name, bool is_file); static void rmdev_schedule(struct device_head *dh, char *name); -static void newopt(struct opt_head *list, char *name, char *value, int append, int dupe); +static void newopt(struct opt_head *list, char *name, char *value, int append); static void rmopt_schedule(struct opt_head *list, char *name); static char * @@ -210,7 +210,7 @@ System_spec: ; System_id: - Save_id { newopt(&mkopt, ns("KERNEL"), $1, 0, 0); }; + Save_id { newopt(&mkopt, ns("KERNEL"), $1, 0); }; System_parameter_list: System_parameter_list ID @@ -230,13 +230,13 @@ NoOpt_list: ; Option: Save_id { - newopt(&opt, $1, NULL, 0, 1); + newopt(&opt, $1, NULL, 0); if (strchr($1, '=') != NULL) errx(1, "%s:%d: The `=' in options should not be " "quoted", yyfile, yyline); } | Save_id EQUALS Opt_value { - newopt(&opt, $1, $3, 0, 1); + newopt(&opt, $1, $3, 0); } ; NoOption: @@ -264,10 +264,10 @@ Mkopt_list: ; Mkoption: - Save_id { newopt(&mkopt, $1, ns(""), 0, 0); } | - Save_id EQUALS { newopt(&mkopt, $1, ns(""), 0, 0); } | - Save_id EQUALS Opt_value { newopt(&mkopt, $1, $3, 0, 0); } | - Save_id PLUSEQUALS Opt_value { newopt(&mkopt, $1, $3, 1, 0); } ; + Save_id { newopt(&mkopt, $1, ns(""), 0); } | + Save_id EQUALS { newopt(&mkopt, $1, ns(""), 0); } | + Save_id EQUALS Opt_value { newopt(&mkopt, $1, $3, 0); } | + Save_id PLUSEQUALS Opt_value { newopt(&mkopt, $1, $3, 1); } ; Dev: ID { $$ = $1; } @@ -293,7 +293,7 @@ NoDev_list: Device: Dev { - newopt(&opt, devopt($1), ns("1"), 0, 0); + newopt(&opt, devopt($1), ns("1"), 0); /* and the device part */ newdev($1); } @@ -430,7 +430,7 @@ findopt(struct opt_head *list, char *name) * Add an option to the list of options. */ static void -newopt(struct opt_head *list, char *name, char *value, int append, int dupe) +newopt(struct opt_head *list, char *name, char *value, int append) { struct opt *op, *op2; @@ -443,7 +443,7 @@ newopt(struct opt_head *list, char *name, char *value, } op2 = findopt(list, name); - if (op2 != NULL && !append && !dupe) { + if (op2 != NULL && !append) { fprintf(stderr, "WARNING: duplicate option `%s' encountered.\n", name); return; @@ -456,15 +456,9 @@ newopt(struct opt_head *list, char *name, char *value, op->op_ownfile = 0; op->op_value = value; if (op2 != NULL) { - if (append) { - while (SLIST_NEXT(op2, op_append) != NULL) - op2 = SLIST_NEXT(op2, op_append); - SLIST_NEXT(op2, op_append) = op; - } else { - while (SLIST_NEXT(op2, op_next) != NULL) - op2 = SLIST_NEXT(op2, op_next); - SLIST_NEXT(op2, op_next) = op; - } + while (SLIST_NEXT(op2, op_append) != NULL) + op2 = SLIST_NEXT(op2, op_append); + SLIST_NEXT(op2, op_append) = op; } else SLIST_INSERT_HEAD(list, op, op_next); } @@ -477,7 +471,8 @@ rmopt_schedule(struct opt_head *list, char *name) { struct opt *op; - while ((op = findopt(list, name)) != NULL) { + op = findopt(list, name); + if (op != NULL) { SLIST_REMOVE(list, op, opt, op_next); free(op->op_name); free(op);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901060215.x062F9ak082101>