CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: maya
Date: Fri May 10 19:29:46 UTC 2024
Modified Files:
src/sys/dev/acpi: acpi_display.c
Log Message:
Add quirk for machines were the getting the brightness value always
returns the same result by keeping a local copy of the last set value.
This makes the brightness buttons work on my Thinkpad T450s, and will
probably fix PR kern/57825 as well.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/acpi/acpi_display.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_display.c
diff -u src/sys/dev/acpi/acpi_display.c:1.23 src/sys/dev/acpi/acpi_display.c:1.24
--- src/sys/dev/acpi/acpi_display.c:1.23 Fri Mar 17 17:16:06 2023
+++ src/sys/dev/acpi/acpi_display.c Fri May 10 19:29:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_display.c,v 1.23 2023/03/17 17:16:06 andvar Exp $ */
+/* $NetBSD: acpi_display.c,v 1.24 2024/05/10 19:29:46 maya Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.23 2023/03/17 17:16:06 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.24 2024/05/10 19:29:46 maya Exp $");
#include
#include
@@ -270,6 +270,12 @@ struct acpidisp_brctl {
uint8_t *bc_level; /* Array of levels */
uint16_t bc_level_count; /* Number of levels */
uint8_t bc_current; /* Current level */
+
+ /*
+ * Quirk if firmware returns wrong values for _BQC
+ * (acpidisp_get_brightness)
+ */
+ bool bc_bqc_broken;
};
/*
@@ -376,6 +382,7 @@ static int acpidisp_get_brightness(const
uint8_t *);
static int acpidisp_set_brightness(const struct acpidisp_out_softc *,
uint8_t);
+static int acpidisp_quirk_get_brightness(const struct acpidisp_out_softc *);
static void acpidisp_print_odinfo(device_t, const struct acpidisp_odinfo *);
static void acpidisp_print_brctl(device_t, const struct acpidisp_brctl *);
@@ -717,6 +724,10 @@ acpidisp_out_attach(device_t parent, dev
kmem_free(bc, sizeof(*bc));
osc->sc_brctl = NULL;
} else {
+ if (acpidisp_quirk_get_brightness(osc)) {
+aprint_error_dev(self,
+"failed to test _BQC quirk\n");
+ }
acpidisp_print_brctl(self, osc->sc_brctl);
}
}
@@ -1860,6 +1871,11 @@ acpidisp_get_brightness(const struct acp
if (!(osc->sc_caps & ACPI_DISP_OUT_CAP__BQC))
return ENODEV;
+ if (osc->sc_brctl->bc_bqc_broken) {
+ *valuep = osc->sc_brctl->bc_current;
+ return 0;
+ }
+
rv = acpi_eval_integer(hdl, "_BQC", );
if (ACPI_FAILURE(rv)) {
aprint_error_dev(osc->sc_dev, "failed to evaluate %s.%s: %s\n",
@@ -1878,6 +1894,60 @@ acpidisp_get_brightness(const struct acp
return 0;
}
+/*
+ * Quirk for when getting the brightness value always returns the same
+ * result, which breaks brightness controls which try to lower the
+ * brightness by a specific value and then check if it worked.
+ */
+static int
+acpidisp_quirk_get_brightness(const struct acpidisp_out_softc *osc)
+{
+ struct acpidisp_brctl *bc;
+ uint8_t original_brightness, test_brightness;
+ int error;
+
+ bc = osc->sc_brctl;
+
+ /* Avoid false results if quirk already enabled */
+ bc->bc_bqc_broken = false;
+
+ error = acpidisp_get_brightness(osc, >bc_current);
+ if (error)
+ return error;
+ original_brightness = bc->bc_current;
+
+ /* Find a different brightness value */
+ test_brightness = bc->bc_level[bc->bc_level_count - 1];
+ if (test_brightness == original_brightness)
+ test_brightness = bc->bc_level[0];
+
+ if (test_brightness == original_brightness) {
+ aprint_error_dev(osc->sc_dev,
+ "couldn't find different brightness levels"
+ " for _BQC quirk test\n");
+ return 0;
+ }
+
+ bc->bc_current = test_brightness;
+ error = acpidisp_set_brightness(osc, bc->bc_current);
+ if (error)
+ return error;
+
+ error = acpidisp_get_brightness(osc, >bc_current);
+ if (error)
+ return error;
+
+ /* We set a different value, but got the original value back */
+ if (bc->bc_current == original_brightness) {
+ aprint_normal_dev(osc->sc_dev, "_BQC broken, enabling quirk\n");
+ bc->bc_bqc_broken = true;
+ }
+
+ /* Restore original value */
+ bc->bc_current = original_brightness;
+ return acpidisp_set_brightness(osc, bc->bc_current);
+}
+
static int
acpidisp_set_brightness(const struct acpidisp_out_softc *osc, uint8_t value)
{
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: maya Date: Fri May 10 19:29:46 UTC 2024 Modified Files: src/sys/dev/acpi: acpi_display.c Log Message: Add quirk for machines were the getting the brightness value always returns the same result by keeping a local copy of the last set value. This makes the brightness buttons work on my Thinkpad T450s, and will probably fix PR kern/57825 as well. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/dev/acpi/acpi_display.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/nvi/dist/docs/vi.man
Module Name:src Committed By: maya Date: Mon Apr 29 00:50:43 UTC 2024 Modified Files: src/external/bsd/nvi/dist/docs/vi.man: vi.1 Log Message: Remove documentation for long removed -F option Suggested by Robert Whitlock in PR bin/58177 I've sent this patch to the nvi maintainers but the response suggested patching this downstream, as there would be no further releases of nvi. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/nvi/dist/docs/vi.man/vi.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/nvi/dist/docs/vi.man/vi.1 diff -u src/external/bsd/nvi/dist/docs/vi.man/vi.1:1.7 src/external/bsd/nvi/dist/docs/vi.man/vi.1:1.8 --- src/external/bsd/nvi/dist/docs/vi.man/vi.1:1.7 Fri Sep 14 13:19:15 2018 +++ src/external/bsd/nvi/dist/docs/vi.man/vi.1 Mon Apr 29 00:50:42 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: vi.1,v 1.7 2018/09/14 13:19:15 rin Exp $ +.\" $NetBSD: vi.1,v 1.8 2024/04/29 00:50:42 maya Exp $ .\" .\" Copyright (c) 1994 .\" The Regents of the University of California. All rights reserved. @@ -12,14 +12,14 @@ .\" .\" Id: vi.1,v 8.53 2001/01/28 13:20:06 skimo Exp (Berkeley) Date: 2001/01/28 13:20:06 .\" -.TH VI 1 "September 14, 2018" +.TH VI 1 "April 28, 2024" .UC .SH NAME ex, vi, view \- text editors .SH SYNOPSIS .B ex [\c -.B -eFGRrSsv\c +.B -eGRrSsv\c ] [\c .BI -c " cmd"\c ] [\c @@ -30,7 +30,7 @@ ex, vi, view \- text editors .br .B vi [\c -.B -eFlRrSv\c +.B -elRrSv\c ] [\c .BI -c " cmd"\c ] [\c @@ -41,7 +41,7 @@ ex, vi, view \- text editors .br .B view [\c -.B -eFGRrSv\c +.B -eGRrSv\c ] [\c .BI -c " cmd"\c ] [\c @@ -115,11 +115,6 @@ supports both the old and new syntax. Start editing in ex mode, as if the command name were .IR \ . .TP -.B \-F -Don't copy the entire file when first starting to edit. -(The default is to make a copy in case someone else modifies -the file during your edit session.) -.TP .B \-G Start editing in gtags mode, as if the gtagsmode option was set. .TP
CVS commit: src/external/bsd/nvi/dist/docs/vi.man
Module Name:src Committed By: maya Date: Mon Apr 29 00:50:43 UTC 2024 Modified Files: src/external/bsd/nvi/dist/docs/vi.man: vi.1 Log Message: Remove documentation for long removed -F option Suggested by Robert Whitlock in PR bin/58177 I've sent this patch to the nvi maintainers but the response suggested patching this downstream, as there would be no further releases of nvi. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/nvi/dist/docs/vi.man/vi.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/httpd
Module Name:src Committed By: maya Date: Sun Apr 28 17:12:30 UTC 2024 Modified Files: src/libexec/httpd: CHANGES bozohttpd.8 bozohttpd.c Log Message: Bump bozohttpd version to today for mobile-friendly directory listing To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/libexec/httpd/CHANGES cvs rdiff -u -r1.96 -r1.97 src/libexec/httpd/bozohttpd.8 cvs rdiff -u -r1.146 -r1.147 src/libexec/httpd/bozohttpd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/CHANGES diff -u src/libexec/httpd/CHANGES:1.55 src/libexec/httpd/CHANGES:1.56 --- src/libexec/httpd/CHANGES:1.55 Fri Jan 26 23:19:44 2024 +++ src/libexec/httpd/CHANGES Sun Apr 28 17:12:30 2024 @@ -1,4 +1,7 @@ -$NetBSD: CHANGES,v 1.55 2024/01/26 23:19:44 mrg Exp $ +$NetBSD: CHANGES,v 1.56 2024/04/28 17:12:30 maya Exp $ + +changes in bozohttpd 20240428: + o make directory listings mobile friendly. from D. Bohdan. changes in bozohttpd 20240126: o add some more default mime types. Index: src/libexec/httpd/bozohttpd.8 diff -u src/libexec/httpd/bozohttpd.8:1.96 src/libexec/httpd/bozohttpd.8:1.97 --- src/libexec/httpd/bozohttpd.8:1.96 Sun Feb 4 05:54:20 2024 +++ src/libexec/httpd/bozohttpd.8 Sun Apr 28 17:12:30 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: bozohttpd.8,v 1.96 2024/02/04 05:54:20 mrg Exp $ +.\" $NetBSD: bozohttpd.8,v 1.97 2024/04/28 17:12:30 maya Exp $ .\" .\" $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $ .\" @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Jan 26, 2024 +.Dd Apr 28, 2024 .Dt BOZOHTTPD 8 .Os .Sh NAME @@ -664,7 +664,7 @@ The focus has always been simplicity and and regular code audits. This manual documents .Nm -version 20240126. +version 20240428. .Sh AUTHORS .An -nosplit .Nm Index: src/libexec/httpd/bozohttpd.c diff -u src/libexec/httpd/bozohttpd.c:1.146 src/libexec/httpd/bozohttpd.c:1.147 --- src/libexec/httpd/bozohttpd.c:1.146 Fri Jan 26 23:19:44 2024 +++ src/libexec/httpd/bozohttpd.c Sun Apr 28 17:12:30 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: bozohttpd.c,v 1.146 2024/01/26 23:19:44 mrg Exp $ */ +/* $NetBSD: bozohttpd.c,v 1.147 2024/04/28 17:12:30 maya Exp $ */ /* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */ @@ -108,7 +108,7 @@ #define INDEX_HTML "index.html" #endif #ifndef SERVER_SOFTWARE -#define SERVER_SOFTWARE "bozohttpd/20240126" +#define SERVER_SOFTWARE "bozohttpd/20240428" #endif #ifndef PUBLIC_HTML #define PUBLIC_HTML "public_html"
CVS commit: src/libexec/httpd
Module Name:src Committed By: maya Date: Sun Apr 28 17:12:30 UTC 2024 Modified Files: src/libexec/httpd: CHANGES bozohttpd.8 bozohttpd.c Log Message: Bump bozohttpd version to today for mobile-friendly directory listing To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/libexec/httpd/CHANGES cvs rdiff -u -r1.96 -r1.97 src/libexec/httpd/bozohttpd.8 cvs rdiff -u -r1.146 -r1.147 src/libexec/httpd/bozohttpd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/httpd
Module Name:src Committed By: maya Date: Fri Apr 26 20:27:12 UTC 2024 Modified Files: src/libexec/httpd: dir-index-bozo.c Log Message: Create mobile-friendly directory listings A typical mobile browser on a smartphone assumes a page without a "viewport" tag is designed for desktop browsers. It displays the page in a virtual window that simulates a wider screen and does not adjust it for the phone's pixel density. The usual result is that the content on the page looks small, and interacting with the page comfortably and precisely requires zoom. This is currently the case with bozohttpd directory listing pages. from D. Bohdan in PR bin/57962 To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/libexec/httpd/dir-index-bozo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/dir-index-bozo.c diff -u src/libexec/httpd/dir-index-bozo.c:1.36 src/libexec/httpd/dir-index-bozo.c:1.37 --- src/libexec/httpd/dir-index-bozo.c:1.36 Wed May 18 00:37:11 2022 +++ src/libexec/httpd/dir-index-bozo.c Fri Apr 26 20:27:12 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: dir-index-bozo.c,v 1.36 2022/05/18 00:37:11 mrg Exp $ */ +/* $NetBSD: dir-index-bozo.c,v 1.37 2024/04/26 20:27:12 maya Exp $ */ /* $eterna: dir-index-bozo.c,v 1.20 2011/11/18 09:21:15 mrg Exp $ */ @@ -123,6 +123,7 @@ bozo_dir_index(bozo_httpreq_t *request, bozo_printf(httpd, "\r\n" "\r\n" + "\r\n" "
CVS commit: src/libexec/httpd
Module Name:src Committed By: maya Date: Fri Apr 26 20:27:12 UTC 2024 Modified Files: src/libexec/httpd: dir-index-bozo.c Log Message: Create mobile-friendly directory listings A typical mobile browser on a smartphone assumes a page without a "viewport" tag is designed for desktop browsers. It displays the page in a virtual window that simulates a wider screen and does not adjust it for the phone's pixel density. The usual result is that the content on the page looks small, and interacting with the page comfortably and precisely requires zoom. This is currently the case with bozohttpd directory listing pages. from D. Bohdan in PR bin/57962 To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/libexec/httpd/dir-index-bozo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: maya Date: Tue Apr 23 03:25:39 UTC 2024 Modified Files: src: UPDATING src/share/mk: bsd.own.mk Log Message: Switch to mesa 21 Works well enough for me on various GPUs, let's try it out. Can be easily reverted if anyone encounters major issues. To generate a diff of this commit: cvs rdiff -u -r1.348 -r1.349 src/UPDATING cvs rdiff -u -r1.1367 -r1.1368 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: maya
Date: Tue Apr 23 03:25:39 UTC 2024
Modified Files:
src: UPDATING
src/share/mk: bsd.own.mk
Log Message:
Switch to mesa 21
Works well enough for me on various GPUs, let's try it out. Can be easily
reverted if anyone encounters major issues.
To generate a diff of this commit:
cvs rdiff -u -r1.348 -r1.349 src/UPDATING
cvs rdiff -u -r1.1367 -r1.1368 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/UPDATING
diff -u src/UPDATING:1.348 src/UPDATING:1.349
--- src/UPDATING:1.348 Sat Apr 20 14:06:47 2024
+++ src/UPDATING Tue Apr 23 03:25:39 2024
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.348 2024/04/20 14:06:47 rillig Exp $
+$NetBSD: UPDATING,v 1.349 2024/04/23 03:25:39 maya Exp $
This file (UPDATING) is intended to be a brief reference to recent
changes that might cause problems in the build process, and a guide for
@@ -19,6 +19,9 @@ See also: BUILDING, build.sh, Makefile.
Recent changes:
^^^
+20240423:
+ Update builds with x11 may fail after switching to Mesa 21.
+
20240410:
Update builds may require manually deleting
$DESTDIR/var/run/named (and, potentially,
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1367 src/share/mk/bsd.own.mk:1.1368
--- src/share/mk/bsd.own.mk:1.1367 Sun Apr 7 14:40:34 2024
+++ src/share/mk/bsd.own.mk Tue Apr 23 03:25:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1367 2024/04/07 14:40:34 tsutsui Exp $
+# $NetBSD: bsd.own.mk,v 1.1368 2024/04/23 03:25:39 maya Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1320,7 +1320,7 @@ MKDTB.earmv7hfeb= yes
MKDTB.riscv32= yes
MKDTB.riscv64= yes
-HAVE_MESA_VER?= 19
+HAVE_MESA_VER?= 21
.if ${HAVE_MESA_VER} == 19
EXTERNAL_MESALIB_DIR?= MesaLib.old
.elif ${HAVE_MESA_VER} == 21
CVS commit: src/external/mit/xorg/lib/libGL
Module Name:src Committed By: maya Date: Mon Apr 22 03:38:49 UTC 2024 Modified Files: src/external/mit/xorg/lib/libGL: Makefile Log Message: mesa21: link against libxcb-sync for missing symbols Not super obvious in practice, but it does show if you run GL programs with LD_BIND_NOW. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/external/mit/xorg/lib/libGL/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/libGL
Module Name:src
Committed By: maya
Date: Mon Apr 22 03:38:49 UTC 2024
Modified Files:
src/external/mit/xorg/lib/libGL: Makefile
Log Message:
mesa21: link against libxcb-sync for missing symbols
Not super obvious in practice, but it does show if you run GL programs
with LD_BIND_NOW.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/external/mit/xorg/lib/libGL/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.34 src/external/mit/xorg/lib/libGL/Makefile:1.35
--- src/external/mit/xorg/lib/libGL/Makefile:1.34 Sun Jul 16 22:20:54 2023
+++ src/external/mit/xorg/lib/libGL/Makefile Mon Apr 22 03:38:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2023/07/16 22:20:54 rjs Exp $
+# $NetBSD: Makefile,v 1.35 2024/04/22 03:38:49 maya Exp $
.include
@@ -217,6 +217,7 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
xcb-dri2 ${.CURDIR}/../libxcb/dri2 \
xcb-glx ${.CURDIR}/../libxcb/glx \
xcb-shm ${.CURDIR}/../libxcb/shm \
+ xcb-sync ${.CURDIR}/../libxcb/sync \
expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
m ${NETBSDSRCDIR}/lib/libm \
pthread ${NETBSDSRCDIR}/lib/libpthread
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: maya
Date: Sun Apr 21 00:23:23 UTC 2024
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
Log Message:
Mesa 21: Add some intel files so we don't have missing symbols
seen as error messages when running "glxgears" on intel.
This also avoids graphical corruption (changed areas of terminal
emulator take a few seconds to gradually update) when the modesetting
driver is explicitly chosen.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/external/mit/xorg/lib/dri/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.39 src/external/mit/xorg/lib/dri/Makefile:1.40
--- src/external/mit/xorg/lib/dri/Makefile:1.39 Sun Jul 16 22:20:54 2023
+++ src/external/mit/xorg/lib/dri/Makefile Sun Apr 21 00:23:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2023/07/16 22:20:54 rjs Exp $
+# $NetBSD: Makefile,v 1.40 2024/04/21 00:23:23 maya Exp $
# Link the mesa_dri_drivers mega driver.
@@ -121,9 +121,11 @@ DRI_SOURCES.i965+= \
blorp.c \
blorp_blit.c \
blorp_clear.c \
+ brw_batch.c \
brw_binding_tables.c \
brw_blit.c \
brw_blorp.c \
+ brw_mipmap_tree.c \
brw_buffer_objects.c \
brw_buffers.c \
brw_bufmgr.c \
@@ -158,6 +160,7 @@ DRI_SOURCES.i965+= \
brw_eu_util.c \
brw_eu_validate.c \
brw_extensions.c \
+ brw_fbo.c \
brw_fs.cpp \
brw_fs_bank_conflicts.cpp \
brw_fs_cmod_propagation.cpp \
@@ -171,20 +174,22 @@ DRI_SOURCES.i965+= \
brw_fs_lower_regioning.cpp \
brw_fs_nir.cpp \
brw_fs_reg_allocate.cpp \
+ brw_ff_gs.c \
+ brw_formatquery.c \
brw_fs_register_coalesce.cpp \
brw_fs_saturate_propagation.cpp \
brw_fs_scoreboard.cpp \
brw_fs_sel_peephole.cpp \
brw_fs_validate.cpp \
brw_fs_visitor.cpp \
- brw_ff_gs.c \
- brw_formatquery.c \
brw_generate_mipmap.c \
brw_gs.c \
brw_gs_surface_state.c \
brw_interpolation_map.c \
brw_ir_performance.cpp \
+ brw_link.cpp \
brw_meta_util.c \
+ brw_mipmap_tree.c \
brw_misc_state.c \
brw_nir.c \
brw_nir_analyze_boolean_resolves.c \
@@ -204,6 +209,7 @@ DRI_SOURCES.i965+= \
brw_nir_rt.c \
brw_nir_tcs_workarounds.c \
brw_nir_trig_workarounds.c \
+ brw_nir_uniforms.cpp \
brw_object_purgeable.c \
brw_packed_float.c \
brw_performance_query.c \
@@ -277,6 +283,7 @@ DRI_SOURCES.i965+= \
gfx8_multisample_state.c \
hsw_queryobj.c \
hsw_sol.c \
+ intel_perf_metrics.c \
isl.c \
isl_aux_info.c \
isl_drm.c \
@@ -311,8 +318,9 @@ I965_INTEL_DEV_FILES = \
intel_device_info.c
I965_INTEL_PERF_FILES = \
- intel_pps_driver.cc \
- intel_pps_perf.cc
+ intel_perf.c \
+ intel_perf_query.c \
+ intel_perf_mdapi.c
INTEL_GENS_BLORP= 40 45 50 60 70 75 80 90 110
@@ -346,6 +354,11 @@ DRI_SOURCES.i965+= i965_${_f}
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/intel/dev/${_f} i965_${_f}
DRI_SOURCES.i965+= i965_${_f}
.endfor
+.for _f in ${I965_INTEL_PERF_FILES}
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/intel/perf/${_f} i965_${_f}
+DRI_SOURCES.i965+= i965_${_f}
+CPPFLAGS.i965_${_f}+= -I${X11SRCDIR.Mesa}/src/intel/perf
+.endfor
.for _f in ${DRI_SOURCES.i965}
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i965 \
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src Committed By: maya Date: Sun Apr 21 00:23:23 UTC 2024 Modified Files: src/external/mit/xorg/lib/dri: Makefile Log Message: Mesa 21: Add some intel files so we don't have missing symbols seen as error messages when running "glxgears" on intel. This also avoids graphical corruption (changed areas of terminal emulator take a few seconds to gradually update) when the modesetting driver is explicitly chosen. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/external/mit/xorg/lib/dri/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/MesaLib/dist/src/amd/common
Module Name:xsrc Committed By: maya Date: Sat Apr 20 15:57:17 UTC 2024 Modified Files: xsrc/external/mit/MesaLib/dist/src/amd/common: ac_rtld.c Log Message: Fix build of mesa 21 This definition is missing from elftoolchain's elfdefinitions.h (via libelf.h), which conflicts with sys/exec_elf.h so we can't get it from sys/exec_elf.h. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c diff -u xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c:1.2 --- xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c:1.1.1.1 Mon May 9 01:23:25 2022 +++ xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c Sat Apr 20 15:57:17 2024 @@ -65,6 +65,10 @@ #define R_AMDGPU_RELATIVE6413 #endif +#ifndef STN_UNDEF +#define STN_UNDEF 0 +#endif + /* For the UMR disassembler. */ #define DEBUGGER_END_OF_CODE_MARKER 0xbf9f /* invalid instruction */ #define DEBUGGER_NUM_MARKERS5
CVS commit: xsrc/external/mit/MesaLib/dist/src/amd/common
Module Name:xsrc Committed By: maya Date: Sat Apr 20 15:57:17 UTC 2024 Modified Files: xsrc/external/mit/MesaLib/dist/src/amd/common: ac_rtld.c Log Message: Fix build of mesa 21 This definition is missing from elftoolchain's elfdefinitions.h (via libelf.h), which conflicts with sys/exec_elf.h so we can't get it from sys/exec_elf.h. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: maya
Date: Wed Apr 17 02:34:45 UTC 2024
Modified Files:
src/sys/dev/usb: uftdi.c
Log Message:
Add support for a range of USB serial adapters
>From Cameron Williams in PR kern/58127
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/usb/uftdi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.77 src/sys/dev/usb/uftdi.c:1.78
--- src/sys/dev/usb/uftdi.c:1.77 Tue Mar 26 03:38:02 2024
+++ src/sys/dev/usb/uftdi.c Wed Apr 17 02:34:45 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.77 2024/03/26 03:38:02 thorpej Exp $ */
+/* $NetBSD: uftdi.c,v 1.78 2024/04/17 02:34:45 maya Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.77 2024/03/26 03:38:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.78 2024/04/17 02:34:45 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -126,6 +126,25 @@ static const struct ucom_methods uftdi_m
*/
static const struct usb_devno uftdi_devs[] = {
{ USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US101 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US159 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US235 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US257 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_56 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_78 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US313 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US320 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US324 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_12 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_34 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_56 },
+ { USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_78 },
{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_TWIST },
{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_SAMBA },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_230X },
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Wed Apr 17 02:34:45 UTC 2024 Modified Files: src/sys/dev/usb: uftdi.c Log Message: Add support for a range of USB serial adapters >From Cameron Williams in PR kern/58127 To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/dev/usb/uftdi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Wed Apr 17 02:33:04 UTC 2024 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: Regen after usbdevs change To generate a diff of this commit: cvs rdiff -u -r1.806 -r1.807 src/sys/dev/usb/usbdevs.h \ src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Wed Apr 17 02:32:09 UTC 2024 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add some USB serial adapters >From Cameron Williams in PR kern/58127 To generate a diff of this commit: cvs rdiff -u -r1.814 -r1.815 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.814 src/sys/dev/usb/usbdevs:1.815 --- src/sys/dev/usb/usbdevs:1.814 Wed Feb 28 21:50:51 2024 +++ src/sys/dev/usb/usbdevs Wed Apr 17 02:32:08 2024 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.814 2024/02/28 21:50:51 dholland Exp $ +$NetBSD: usbdevs,v 1.815 2024/04/17 02:32:08 maya Exp $ /*- * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -1118,6 +1118,27 @@ product BILLIONTON USBEL100 0x0988 USB10 product BILLIONTON USBE100 0x8511 USBE100 product BILLIONTON USB2AR 0x90ff USB2AR Ethernet +/* Brainboxes Limited products */ +product BRAINBOXES US101 0x1011 US-101 USB2Serial 1xRS232 +product BRAINBOXES US159 0x1021 US-159 USB2Serial 1xRS232 +product BRAINBOXES US235 0x1017 US-235 USB2Serial 1xRS232 +product BRAINBOXES US257 0x5001 US-257 USB2Serial 2xRS232 +product BRAINBOXES US279_12 0x2021 US-279 USB2Serial 8xRS232 (Port 1 and 2) +product BRAINBOXES US279_34 0x2022 US-279 USB2Serial 8xRS232 (Port 3 and 4) +product BRAINBOXES US279_56 0x2023 US-279 USB2Serial 8xRS232 (Port 5 and 6) +product BRAINBOXES US279_78 0x2024 US-279 USB2Serial 8xRS232 (Port 7 and 8) +product BRAINBOXES US313 0x6001 US-313 USB2Serial 2xRS422/485 +product BRAINBOXES US320 0x1019 US-320 USB2Serial 1xRS422/485 +product BRAINBOXES US324 0x1013 US-324 USB2Serial 1xRS422/485 +product BRAINBOXES US346_12 0x3011 US-346 USB2Serial 4xRS422/485 (Port 1 and 2) +product BRAINBOXES US346_34 0x3012 US-346 USB2Serial 4xRS422/485 (Port 3 and 4) +product BRAINBOXES US701_12 0x2011 US-701 USB2Serial 4xRS232 (Port 1 and 2) +product BRAINBOXES US701_34 0x2012 US-701 USB2Serial 4xRS232 (Port 3 and 4) +product BRAINBOXES US842_12 0x8001 US-842 USB2Serial 8xRS422/485 (Port 1 and 2) +product BRAINBOXES US842_34 0x8002 US-842 USB2Serial 8xRS422/485 (Port 3 and 4) +product BRAINBOXES US842_56 0x8003 US-842 USB2Serial 8xRS422/485 (Port 5 and 6) +product BRAINBOXES US842_78 0x8004 US-842 USB2Serial 8xRS422/485 (Port 7 and 8) + /* Broadcom products */ product BROADCOM BCMFW 0x0bdc BCMFW product BROADCOM BCM2033 0x2000 BCM2033
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Wed Apr 17 02:32:09 UTC 2024 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add some USB serial adapters >From Cameron Williams in PR kern/58127 To generate a diff of this commit: cvs rdiff -u -r1.814 -r1.815 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src Committed By: maya Date: Tue Apr 16 16:13:45 UTC 2024 Modified Files: src/distrib/amd64/liveimage/emuimage: Makefile rc.conf.emuimage spec.emuimage Log Message: restore amd64 live image support for resize root after combined mbr/gpt commit we need to resize_gpt now, as it takes precedence over mbr/disklabel this change brings us to behave like the evbarm images. XXX: we don't seem to touch disklabel and MBR, but they exist. Not sure whether that has any negative repercussions, maybe another system might regard MBR as the sole source of truth when GPT also exists. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/liveimage/emuimage/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/emuimage/spec.emuimage Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src
Committed By: maya
Date: Tue Apr 16 16:13:45 UTC 2024
Modified Files:
src/distrib/amd64/liveimage/emuimage: Makefile rc.conf.emuimage
spec.emuimage
Log Message:
restore amd64 live image support for resize root after combined mbr/gpt commit
we need to resize_gpt now, as it takes precedence over mbr/disklabel
this change brings us to behave like the evbarm images.
XXX: we don't seem to touch disklabel and MBR, but they exist. Not sure whether
that has any negative repercussions, maybe another system might regard MBR as
the
sole source of truth when GPT also exists.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/liveimage/emuimage/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/emuimage/spec.emuimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/liveimage/emuimage/Makefile
diff -u src/distrib/amd64/liveimage/emuimage/Makefile:1.9 src/distrib/amd64/liveimage/emuimage/Makefile:1.10
--- src/distrib/amd64/liveimage/emuimage/Makefile:1.9 Sat Jul 24 16:13:44 2021
+++ src/distrib/amd64/liveimage/emuimage/Makefile Tue Apr 16 16:13:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/07/24 16:13:44 jmcneill Exp $
+# $NetBSD: Makefile,v 1.10 2024/04/16 16:13:44 maya Exp $
LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live # gives ${IMGBASE}.img
@@ -13,6 +13,6 @@ SPEC_EXTRA= ${.CURDIR}/spec.emuimage
RC_CONF_EXTRA= ${.CURDIR}/rc.conf.emuimage
IMGFILE_EXTRA=\
${FILESDIR}/ec2_init etc/rc.d/ec2_init \
- ${FILESDIR}/resize_disklabel etc/rc.d/resize_disklabel
+ ${FILESDIR}/resize_gpt etc/rc.d/resize_gpt
.include "${.CURDIR}/../Makefile.liveimage"
Index: src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage
diff -u src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.3 src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.4
--- src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.3 Wed Sep 27 00:24:12 2023
+++ src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage Tue Apr 16 16:13:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf.emuimage,v 1.3 2023/09/27 00:24:12 riastradh Exp $
+# $NetBSD: rc.conf.emuimage,v 1.4 2024/04/16 16:13:44 maya Exp $
is_ec2() {
val=NO
@@ -25,7 +25,7 @@ is_ec2() {
}
certctl_init=YES
-resize_disklabel=YES
+resize_gpt=YES
resize_root=YES
resize_root_flags="-p"
resize_root_postcmd="/sbin/reboot -n"
Index: src/distrib/amd64/liveimage/emuimage/spec.emuimage
diff -u src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.2 src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.3
--- src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.2 Sat Jul 24 16:13:44 2021
+++ src/distrib/amd64/liveimage/emuimage/spec.emuimage Tue Apr 16 16:13:44 2024
@@ -1,3 +1,3 @@
-# $NetBSD: spec.emuimage,v 1.2 2021/07/24 16:13:44 jmcneill Exp $
+# $NetBSD: spec.emuimage,v 1.3 2024/04/16 16:13:44 maya Exp $
./etc/rc.d/ec2_init type=file mode=0555 uname=root gname=wheel
-./etc/rc.d/resize_disklabel type=file mode=0555 uname=root gname=wheel
+./etc/rc.d/resize_gpt type=file mode=0555 uname=root gname=wheel
CVS commit: src/distrib/amd64/liveimage
Module Name:src
Committed By: maya
Date: Sat Apr 13 18:38:17 UTC 2024
Modified Files:
src/distrib/amd64/liveimage: Makefile.liveimage
Log Message:
amd64 live image: support EFI as well as BIOS boot
The biggest caveat is that there's a small number of machines that try to
EFI boot but fail, so would prefer a BIOS only image. I'm not adding a
separate BIOS only image because the live image is pretty niche.
(For regular installation images, we do create a separate BIOS-only version)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/Makefile.liveimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/liveimage/Makefile.liveimage
diff -u src/distrib/amd64/liveimage/Makefile.liveimage:1.2 src/distrib/amd64/liveimage/Makefile.liveimage:1.3
--- src/distrib/amd64/liveimage/Makefile.liveimage:1.2 Sat Dec 15 18:03:17 2018
+++ src/distrib/amd64/liveimage/Makefile.liveimage Sat Apr 13 18:38:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.liveimage,v 1.2 2018/12/15 18:03:17 gson Exp $
+# $NetBSD: Makefile.liveimage,v 1.3 2024/04/13 18:38:17 maya Exp $
.include
@@ -7,6 +7,11 @@ PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
SECONDARY_BOOT_ARG= # unnecessary
+EFIBOOT= ${WORKDIR}/usr/mdec/bootx64.efi
+EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.efi
+
USE_MBR= yes
+USE_GPT= yes
+USE_GPTMBR= yes
.include "${.CURDIR}/../../../common/bootimage/Makefile.liveimage"
CVS commit: src/distrib/amd64/liveimage
Module Name:src Committed By: maya Date: Sat Apr 13 18:38:17 UTC 2024 Modified Files: src/distrib/amd64/liveimage: Makefile.liveimage Log Message: amd64 live image: support EFI as well as BIOS boot The biggest caveat is that there's a small number of machines that try to EFI boot but fail, so would prefer a BIOS only image. I'm not adding a separate BIOS only image because the live image is pretty niche. (For regular installation images, we do create a separate BIOS-only version) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/Makefile.liveimage Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Sat Jan 6 00:26:26 UTC 2024 Modified Files: src/sys/dev/usb: if_urtwn.c Log Message: Add Mercusys NW150US V2 USB support No changes needed, other than recognizing it as working. >From Daeil Lee in PR/57819 To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/sys/dev/usb/if_urtwn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: maya
Date: Sat Jan 6 00:26:26 UTC 2024
Modified Files:
src/sys/dev/usb: if_urtwn.c
Log Message:
Add Mercusys NW150US V2 USB support
No changes needed, other than recognizing it as working.
>From Daeil Lee in PR/57819
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/usb/if_urtwn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.107 src/sys/dev/usb/if_urtwn.c:1.108
--- src/sys/dev/usb/if_urtwn.c:1.107 Tue Aug 1 07:04:16 2023
+++ src/sys/dev/usb/if_urtwn.c Sat Jan 6 00:26:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.107 2023/08/01 07:04:16 mrg Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.108 2024/01/06 00:26:26 maya Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.107 2023/08/01 07:04:16 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.108 2024/01/06 00:26:26 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -215,6 +215,7 @@ static const struct urtwn_dev {
/* URTWN_RTL8188E */
URTWN_RTL8188E_DEV(DLINK, DWA125D1),
URTWN_RTL8188E_DEV(ELECOM, WDC150SU2M),
+ URTWN_RTL8188E_DEV(MERCUSYS, MW150USV2),
URTWN_RTL8188E_DEV(REALTEK, RTL8188ETV),
URTWN_RTL8188E_DEV(REALTEK, RTL8188EU),
URTWN_RTL8188E_DEV(ABOCOM, RTL8188EU),
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Sat Jan 6 00:24:37 UTC 2024 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: Regen usbdevs To generate a diff of this commit: cvs rdiff -u -r1.803 -r1.804 src/sys/dev/usb/usbdevs.h \ src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Sat Jan 6 00:24:07 UTC 2024 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add Mercusys and Mercusys MW150USV2 >From Daeil Lee in PR/57819 To generate a diff of this commit: cvs rdiff -u -r1.811 -r1.812 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.811 src/sys/dev/usb/usbdevs:1.812 --- src/sys/dev/usb/usbdevs:1.811 Sun Dec 24 02:42:51 2023 +++ src/sys/dev/usb/usbdevs Sat Jan 6 00:24:07 2024 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.811 2023/12/24 02:42:51 gutteridge Exp $ +$NetBSD: usbdevs,v 1.812 2024/01/06 00:24:07 maya Exp $ /*- * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -586,6 +586,7 @@ vendor HIROSE 0x2631 Hirose Electric vendor ONEPLUS 0x2717 ONEPLUS vendor NHJ 0x2770 NHJ vendor PLANEX 0x2c02 Planex Communications +vendor MERCUSYS 0x2c4e Mercusys vendor VIDZMEDIA 0x3275 VidzMedia Pte Ltd vendor AEI 0x3334 AEI vendor HANK 0x3353 Hank Connection @@ -2288,6 +2289,9 @@ product MELCO WLIUCGNM 0x01a2 WLI-UC-GN product MELCO WLIUCGNM2T 0x01ee WLI-UC-GNM2T product MELCO WIU2300D 0x0241 WI-U2-300D +/* Mercusys products */ +product MERCUSYS MW150USV2 0x0102 MW150US V2 + /* Merlin products */ product MERLIN V620 0x1110 Merlin V620
CVS commit: src/sys/dev/usb
Module Name:src Committed By: maya Date: Sat Jan 6 00:24:07 UTC 2024 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add Mercusys and Mercusys MW150USV2 >From Daeil Lee in PR/57819 To generate a diff of this commit: cvs rdiff -u -r1.811 -r1.812 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/common/bootimage
Module Name:src Committed By: maya Date: Sun Jan 29 22:12:25 UTC 2023 Modified Files: src/distrib/common/bootimage: fstab.in Log Message: Make sure to mount /var/shm Programs such as firefox seem to require it, and this file is used by the live image as well. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/common/bootimage/fstab.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/common/bootimage/fstab.in diff -u src/distrib/common/bootimage/fstab.in:1.3 src/distrib/common/bootimage/fstab.in:1.4 --- src/distrib/common/bootimage/fstab.in:1.3 Sat Dec 15 18:03:17 2018 +++ src/distrib/common/bootimage/fstab.in Sun Jan 29 22:12:25 2023 @@ -1,5 +1,6 @@ -ROOT.a / ffs rw 1 1 -ROOT.b none none sw 0 0 -ptyfs /dev/pts ptyfs rw 0 0 -kernfs /kern kernfs rw,noauto 0 0 -procfs /proc procfs rw,noauto 0 0 +ROOT.a / ffs rw 1 1 +ROOT.b none none sw 0 0 +ptyfs /dev/pts ptyfs rw 0 0 +kernfs /kern kernfs rw,noauto 0 0 +procfs /proc procfs rw,noauto 0 0 +tmpfs /var/shm tmpfs rw,-m1777,-sram%25 0 0
CVS commit: src/distrib/common/bootimage
Module Name:src Committed By: maya Date: Sun Jan 29 22:12:25 UTC 2023 Modified Files: src/distrib/common/bootimage: fstab.in Log Message: Make sure to mount /var/shm Programs such as firefox seem to require it, and this file is used by the live image as well. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/common/bootimage/fstab.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: maya Date: Wed Jul 27 18:29:35 UTC 2022 Modified Files: src/distrib/sets/lists/modules: md.amd64 md.i386 src/share/mk: bsd.own.mk src/sys/modules: Makefile Log Message: Enable amdgpu module & firmware on x86 Make it easier to test this one out, add `load amdgpu` before boot netbsd. XXX there should probably be a drm block in sys/modules/Makefile which includes aarch64. To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.1286 -r1.1287 src/share/mk/bsd.own.mk cvs rdiff -u -r1.267 -r1.268 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/md.amd64 diff -u src/distrib/sets/lists/modules/md.amd64:1.93 src/distrib/sets/lists/modules/md.amd64:1.94 --- src/distrib/sets/lists/modules/md.amd64:1.93 Sat Sep 25 17:55:37 2021 +++ src/distrib/sets/lists/modules/md.amd64 Wed Jul 27 18:29:35 2022 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.93 2021/09/25 17:55:37 maya Exp $ +# $NetBSD: md.amd64,v 1.94 2022/07/27 18:29:35 maya Exp $ # ./@MODULEDIR@/acpiacadmodules-base-kernel kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod @@ -28,6 +28,8 @@ ./@MODULEDIR@/acpiwmi/acpiwmi.kmod modules-base-kernel kmod ./@MODULEDIR@/aibsmodules-base-kernel kmod ./@MODULEDIR@/aibs/aibs.kmod modules-base-kernel kmod +./@MODULEDIR@/amdgpumodules-base-kernel kmod +./@MODULEDIR@/amdgpu/amdgpu.kmod modules-base-kernel kmod ./@MODULEDIR@/amdsmnmodules-base-kernel kmod ./@MODULEDIR@/amdsmn/amdsmn.kmod modules-base-kernel kmod ./@MODULEDIR@/amdtempmodules-base-kernel kmod Index: src/distrib/sets/lists/modules/md.i386 diff -u src/distrib/sets/lists/modules/md.i386:1.91 src/distrib/sets/lists/modules/md.i386:1.92 --- src/distrib/sets/lists/modules/md.i386:1.91 Sat Sep 25 17:55:37 2021 +++ src/distrib/sets/lists/modules/md.i386 Wed Jul 27 18:29:35 2022 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.91 2021/09/25 17:55:37 maya Exp $ +# $NetBSD: md.i386,v 1.92 2022/07/27 18:29:35 maya Exp $ # ./@MODULEDIR@/acpiacadmodules-base-kernel kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod @@ -28,6 +28,8 @@ ./@MODULEDIR@/acpiwmi/acpiwmi.kmod modules-base-kernel kmod ./@MODULEDIR@/aibsmodules-base-kernel kmod ./@MODULEDIR@/aibs/aibs.kmod modules-base-kernel kmod +./@MODULEDIR@/amdgpumodules-base-kernel kmod +./@MODULEDIR@/amdgpu/amdgpu.kmod modules-base-kernel kmod ./@MODULEDIR@/amdsmnmodules-base-kernel kmod ./@MODULEDIR@/amdsmn/amdsmn.kmod modules-base-kernel kmod ./@MODULEDIR@/amdtempmodules-base-kernel kmod Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.1286 src/share/mk/bsd.own.mk:1.1287 --- src/share/mk/bsd.own.mk:1.1286 Thu Jul 14 03:48:49 2022 +++ src/share/mk/bsd.own.mk Wed Jul 27 18:29:35 2022 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1286 2022/07/14 03:48:49 mrg Exp $ +# $NetBSD: bsd.own.mk,v 1.1287 2022/07/27 18:29:35 maya Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -1249,6 +1249,8 @@ MKNOUVEAUFIRMWARE.aarch64= yes MKRADEONFIRMWARE.x86_64= yes MKRADEONFIRMWARE.i386= yes MKRADEONFIRMWARE.aarch64= yes +MKAMDGPUFIRMWARE.x86_64= yes +MKAMDGPUFIRMWARE.i386= yes # Only install the tegra firmware on evbarm. MKTEGRAFIRMWARE.evbarm= yes Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.267 src/sys/modules/Makefile:1.268 --- src/sys/modules/Makefile:1.267 Sun Jul 17 15:36:05 2022 +++ src/sys/modules/Makefile Wed Jul 27 18:29:35 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.267 2022/07/17 15:36:05 riastradh Exp $ +# $NetBSD: Makefile,v 1.268 2022/07/27 18:29:35 maya Exp $ .include @@ -356,6 +356,7 @@ SUBDIR+= drm #SUBDIR+= drmkms_pci #SUBDIR+= drmkms_ttm SUBDIR+= i915drm +SUBDIR+= amdgpu #SUBDIR+= i915drmkms # # ISA modules
CVS commit: src
Module Name:src Committed By: maya Date: Wed Jul 27 18:29:35 UTC 2022 Modified Files: src/distrib/sets/lists/modules: md.amd64 md.i386 src/share/mk: bsd.own.mk src/sys/modules: Makefile Log Message: Enable amdgpu module & firmware on x86 Make it easier to test this one out, add `load amdgpu` before boot netbsd. XXX there should probably be a drm block in sys/modules/Makefile which includes aarch64. To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.1286 -r1.1287 src/share/mk/bsd.own.mk cvs rdiff -u -r1.267 -r1.268 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src
Committed By: maya
Date: Mon Jan 24 00:15:09 UTC 2022
Modified Files:
src/sys/arch/amd64/conf: kern.ldscript.Xen
src/sys/arch/i386/conf: kern.ldscript.Xen
Log Message:
put .note.Xen into PT_NOTE
this is where grub 2.02 and possibly other things expect
to find it.
Fixes booting with grub2 on prgmr.com.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amd64/conf/kern.ldscript.Xen
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/conf/kern.ldscript.Xen
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/kern.ldscript.Xen
diff -u src/sys/arch/amd64/conf/kern.ldscript.Xen:1.17 src/sys/arch/amd64/conf/kern.ldscript.Xen:1.18
--- src/sys/arch/amd64/conf/kern.ldscript.Xen:1.17 Thu May 21 09:36:24 2020
+++ src/sys/arch/amd64/conf/kern.ldscript.Xen Mon Jan 24 00:15:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.17 2020/05/21 09:36:24 jdolecek Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.18 2022/01/24 00:15:09 maya Exp $ */
#include "assym.h"
@@ -13,7 +13,7 @@ SECTIONS
*(.text.*)
*(.stub)
. = ALIGN(__PAGE_SIZE);
- } =0xCC
+ } :main =0xCC
_etext = . ;
PROVIDE (etext = .) ;
@@ -80,5 +80,14 @@ SECTIONS
{
KEEP(*(.note.netbsd.ident));
}
+ .note.Xen :
+ {
+ KEEP(*(.note.Xen));
+ } :notes
}
+PHDRS
+{
+ main PT_LOAD;
+ notes PT_NOTE;
+}
Index: src/sys/arch/i386/conf/kern.ldscript.Xen
diff -u src/sys/arch/i386/conf/kern.ldscript.Xen:1.16 src/sys/arch/i386/conf/kern.ldscript.Xen:1.17
--- src/sys/arch/i386/conf/kern.ldscript.Xen:1.16 Sun Jun 24 18:24:53 2018
+++ src/sys/arch/i386/conf/kern.ldscript.Xen Mon Jan 24 00:15:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.16 2018/06/24 18:24:53 maxv Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.17 2022/01/24 00:15:09 maya Exp $ */
#include "assym.h"
@@ -12,7 +12,7 @@ SECTIONS
*(.text.*)
*(.stub)
. = ALIGN(__PAGE_SIZE);
- } =0xCC
+ } :main =0xCC
_etext = . ;
PROVIDE (etext = .) ;
@@ -75,5 +75,14 @@ SECTIONS
{
KEEP(*(.note.netbsd.ident));
}
+ .note.Xen :
+ {
+ KEEP(*(.note.Xen));
+ } :notes
}
+PHDRS
+{
+ main PT_LOAD;
+ notes PT_NOTE;
+}
CVS commit: src/sys/arch
Module Name:src Committed By: maya Date: Mon Jan 24 00:15:09 UTC 2022 Modified Files: src/sys/arch/amd64/conf: kern.ldscript.Xen src/sys/arch/i386/conf: kern.ldscript.Xen Log Message: put .note.Xen into PT_NOTE this is where grub 2.02 and possibly other things expect to find it. Fixes booting with grub2 on prgmr.com. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amd64/conf/kern.ldscript.Xen cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/conf/kern.ldscript.Xen Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/nvidia-firmware/nouveau/gm200/gr
Module Name:src
Committed By: maya
Date: Tue Dec 14 22:47:07 UTC 2021
Modified Files:
src/external/nvidia-firmware/nouveau/gm200/gr: Makefile
Log Message:
Don't install a symlink for when there's already a file.
Caused some cryptic issues in the builds far further along.
Pointed out by paulg, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/nvidia-firmware/nouveau/gm200/gr/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/nvidia-firmware/nouveau/gm200/gr/Makefile
diff -u src/external/nvidia-firmware/nouveau/gm200/gr/Makefile:1.1 src/external/nvidia-firmware/nouveau/gm200/gr/Makefile:1.2
--- src/external/nvidia-firmware/nouveau/gm200/gr/Makefile:1.1 Mon Dec 13 23:59:36 2021
+++ src/external/nvidia-firmware/nouveau/gm200/gr/Makefile Tue Dec 14 22:47:07 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/12/13 23:59:36 maya Exp $
+# $NetBSD: Makefile,v 1.2 2021/12/14 22:47:07 maya Exp $
NOMAN= # defined
@@ -77,11 +77,5 @@ SYMLINKS+= ${FIRMWAREDIR}/nouveau/nvidia
SYMLINKS+= ${FIRMWAREDIR}/nouveau/nvidia/gp102/gr/fecs_bl.bin \
${FIRMWAREDIR}/nouveau/nvidia/gp106/gr/fecs_bl.bin
-SYMLINKS+= ${FIRMWAREDIR}/nouveau/nvidia/gp102/gr/fecs_bl.bin \
- ${FIRMWAREDIR}/nouveau/nvidia/gp107/gr/fecs_bl.bin
-
-SYMLINKS+= ${FIRMWAREDIR}/nouveau/nvidia/gp102/gr/fecs_bl.bin \
- ${FIRMWAREDIR}/nouveau/nvidia/gp108/gr/fecs_bl.bin
-
.include
.include
CVS commit: src/external/nvidia-firmware/nouveau/gm200/gr
Module Name:src Committed By: maya Date: Tue Dec 14 22:47:07 UTC 2021 Modified Files: src/external/nvidia-firmware/nouveau/gm200/gr: Makefile Log Message: Don't install a symlink for when there's already a file. Caused some cryptic issues in the builds far further along. Pointed out by paulg, thanks. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/nvidia-firmware/nouveau/gm200/gr/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/gpufw
Module Name:src Committed By: maya Date: Tue Dec 14 12:13:39 UTC 2021 Modified Files: src/distrib/sets/lists/gpufw: mi Log Message: don't conditionalize the installation of nouveau directories To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/gpufw/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/gpufw/mi diff -u src/distrib/sets/lists/gpufw/mi:1.5 src/distrib/sets/lists/gpufw/mi:1.6 --- src/distrib/sets/lists/gpufw/mi:1.5 Mon Dec 13 23:59:35 2021 +++ src/distrib/sets/lists/gpufw/mi Tue Dec 14 12:13:38 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.5 2021/12/13 23:59:35 maya Exp $ +# $NetBSD: mi,v 1.6 2021/12/14 12:13:38 maya Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -365,7 +365,7 @@ ./libdata/firmware/amdgpu/verde_rlc.bin base-gpufw amdgpufirmware ./libdata/firmware/amdgpu/verde_smc.bin base-gpufw amdgpufirmware ./libdata/firmware/nouveau/nvidia/LICENCE.nvidia base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gk20abase-gpufw nouveaufirmware +./libdata/firmware/nouveau/nvidia/gk20abase-gpufw ./libdata/firmware/nouveau/nvidia/gk20a/fecs_data.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gk20a/fecs_inst.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gk20a/gpccs_data.bin base-gpufw nouveaufirmware @@ -374,12 +374,12 @@ ./libdata/firmware/nouveau/nvidia/gk20a/sw_ctx.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gk20a/sw_method_init.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gk20a/sw_nonctx.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm200base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm200/acr base-gpufw nouveaufirmware +./libdata/firmware/nouveau/nvidia/gm200base-gpufw +./libdata/firmware/nouveau/nvidia/gm200/acr base-gpufw ./libdata/firmware/nouveau/nvidia/gm200/acr/bl.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm200/acr/ucode_load.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm200/acr/ucode_unload.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm200/gr base-gpufw nouveaufirmware +./libdata/firmware/nouveau/nvidia/gm200/gr base-gpufw ./libdata/firmware/nouveau/nvidia/gm200/gr/fecs_bl.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm200/gr/fecs_data.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm200/gr/fecs_inst.bin base-gpufw nouveaufirmware @@ -392,12 +392,12 @@ ./libdata/firmware/nouveau/nvidia/gm200/gr/sw_ctx.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm200/gr/sw_method_init.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm200/gr/sw_nonctx.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm204base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm204/acr base-gpufw nouveaufirmware +./libdata/firmware/nouveau/nvidia/gm204base-gpufw +./libdata/firmware/nouveau/nvidia/gm204/acr base-gpufw ./libdata/firmware/nouveau/nvidia/gm204/acr/bl.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm204/acr/ucode_load.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm204/acr/ucode_unload.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm204/gr base-gpufw nouveaufirmware +./libdata/firmware/nouveau/nvidia/gm204/gr base-gpufw ./libdata/firmware/nouveau/nvidia/gm204/gr/fecs_bl.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm204/gr/fecs_data.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm204/gr/fecs_inst.bin base-gpufw nouveaufirmware @@ -410,15 +410,16 @@ ./libdata/firmware/nouveau/nvidia/gm204/gr/sw_ctx.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm204/gr/sw_method_init.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm204/gr/sw_nonctx.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm206/acr base-gpufw nouveaufirmware +./libdata/firmware/nouveau/nvidia/gm206base-gpufw +./libdata/firmware/nouveau/nvidia/gm206/acr base-gpufw ./libdata/firmware/nouveau/nvidia/gm206/acr/bl.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm206/acr/ucode_load.bin base-gpufw nouveaufirmware ./libdata/firmware/nouveau/nvidia/gm206/acr/ucode_unload.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm206/fecs_data.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm206/fecs_inst.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm206/gpccs_data.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm206/gpccs_inst.bin base-gpufw nouveaufirmware -./libdata/firmware/nouveau/nvidia/gm206/gr base-gpufw nouveaufirmware
CVS commit: src/distrib/sets/lists/gpufw
Module Name:src Committed By: maya Date: Tue Dec 14 12:13:39 UTC 2021 Modified Files: src/distrib/sets/lists/gpufw: mi Log Message: don't conditionalize the installation of nouveau directories To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/gpufw/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/nvidia-firmware/nouveau/dist
Module Name:src Committed By: maya Date: Tue Dec 14 08:36:51 UTC 2021 Update of /cvsroot/src/external/nvidia-firmware/nouveau/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4483 Log Message: Import nvidia firmware from linux-firmware repository at commit: commit 2984e265cac6ef19a0de4fb21396fb87f45273d9 Merge: 6f5aada 359ab77 Author: Josh Boyer Date: Fri Sep 3 11:11:05 2021 -0400 Merge tag 'iwlwifi-fw-2021-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware into main Revert accidentally released untested binaries Signed-off-by: Josh Boyer Only LICENCE.nvidia file, which I've omitted by accident. Status: Vendor Tag: LINUX-FIRMWARE Release Tags: linux-firmware-2021-09-03-2984e265 N src/external/nvidia-firmware/nouveau/dist/LICENCE.nvidia No conflicts created by this import
CVS import: src/external/nvidia-firmware/nouveau/dist
Module Name:src Committed By: maya Date: Tue Dec 14 08:36:51 UTC 2021 Update of /cvsroot/src/external/nvidia-firmware/nouveau/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4483 Log Message: Import nvidia firmware from linux-firmware repository at commit: commit 2984e265cac6ef19a0de4fb21396fb87f45273d9 Merge: 6f5aada 359ab77 Author: Josh Boyer Date: Fri Sep 3 11:11:05 2021 -0400 Merge tag 'iwlwifi-fw-2021-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware into main Revert accidentally released untested binaries Signed-off-by: Josh Boyer Only LICENCE.nvidia file, which I've omitted by accident. Status: Vendor Tag: LINUX-FIRMWARE Release Tags: linux-firmware-2021-09-03-2984e265 N src/external/nvidia-firmware/nouveau/dist/LICENCE.nvidia No conflicts created by this import
CVS commit: src
Module Name:src Committed By: maya Date: Mon Dec 13 23:59:42 UTC 2021 Modified Files: src/distrib/sets/lists/gpufw: mi src/etc/mtree: NetBSD.dist.base src/external/nvidia-firmware: Makefile Added Files: src/external/nvidia-firmware/nouveau: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/common: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gk20a: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm200: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm200/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm200/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm204: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm204/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm206: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm206/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm206/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm20b: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm20b/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm20b/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm20b/pmu: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp100: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp100/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp100/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102/nvdec: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102/sec2: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp104: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp104/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp106: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp106/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp107: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp107/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp108: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp108/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp10b: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp10b/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp10b/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp10b/pmu: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100/nvdec: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100/sec2: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102/nvdec: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102/sec2: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu104: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu104/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu106: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu106/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116/nvdec: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116/sec2: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu117: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu117/gr: Makefile Makefile.inc Log Message: Add newer nouveau firmware build goo Symlinks inferred from linux-firmware/WHENCE and compared to a linux distro's firmware. Note: said linux distro appears to have some mistakes compared to the linux-firmware repo in linking ucode_unload.bin to unload_bl.bin and vice versa in some places. I didn't replicate this aspect, and lack the hardware to test it. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/gpufw/mi cvs rdiff
CVS commit: src
Module Name:src Committed By: maya Date: Mon Dec 13 23:59:42 UTC 2021 Modified Files: src/distrib/sets/lists/gpufw: mi src/etc/mtree: NetBSD.dist.base src/external/nvidia-firmware: Makefile Added Files: src/external/nvidia-firmware/nouveau: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/common: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gk20a: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm200: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm200/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm200/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm204: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm204/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm206: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm206/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm206/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm20b: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm20b/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm20b/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gm20b/pmu: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp100: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp100/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp100/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102/nvdec: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp102/sec2: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp104: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp104/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp106: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp106/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp107: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp107/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp108: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp108/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp10b: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp10b/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp10b/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gp10b/pmu: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100/nvdec: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/gv100/sec2: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102/nvdec: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu102/sec2: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu104: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu104/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu106: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu106/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116/acr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116/gr: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116/nvdec: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu116/sec2: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu117: Makefile Makefile.inc src/external/nvidia-firmware/nouveau/tu117/gr: Makefile Makefile.inc Log Message: Add newer nouveau firmware build goo Symlinks inferred from linux-firmware/WHENCE and compared to a linux distro's firmware. Note: said linux distro appears to have some mistakes compared to the linux-firmware repo in linking ucode_unload.bin to unload_bl.bin and vice versa in some places. I didn't replicate this aspect, and lack the hardware to test it. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/gpufw/mi cvs rdiff
CVS commit: src
Module Name:src Committed By: maya Date: Sun Dec 12 20:33:22 UTC 2021 Modified Files: src/distrib/sets/lists/gpufw: mi src/etc/mtree: NetBSD.dist.base src/external: Makefile src/share/mk: bsd.own.mk Added Files: src/external/amdgpu-firmware: Makefile src/external/amdgpu-firmware/amdgpu: Makefile Makefile.inc Log Message: Add amdgpu firmware build goo (disabled) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/gpufw/mi cvs rdiff -u -r1.238 -r1.239 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.22 -r1.23 src/external/Makefile cvs rdiff -u -r0 -r1.1 src/external/amdgpu-firmware/Makefile cvs rdiff -u -r0 -r1.1 src/external/amdgpu-firmware/amdgpu/Makefile \ src/external/amdgpu-firmware/amdgpu/Makefile.inc cvs rdiff -u -r1.1269 -r1.1270 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: maya Date: Sun Dec 12 20:33:22 UTC 2021 Modified Files: src/distrib/sets/lists/gpufw: mi src/etc/mtree: NetBSD.dist.base src/external: Makefile src/share/mk: bsd.own.mk Added Files: src/external/amdgpu-firmware: Makefile src/external/amdgpu-firmware/amdgpu: Makefile Makefile.inc Log Message: Add amdgpu firmware build goo (disabled) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/gpufw/mi cvs rdiff -u -r1.238 -r1.239 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.22 -r1.23 src/external/Makefile cvs rdiff -u -r0 -r1.1 src/external/amdgpu-firmware/Makefile cvs rdiff -u -r0 -r1.1 src/external/amdgpu-firmware/amdgpu/Makefile \ src/external/amdgpu-firmware/amdgpu/Makefile.inc cvs rdiff -u -r1.1269 -r1.1270 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/gpufw/mi diff -u src/distrib/sets/lists/gpufw/mi:1.3 src/distrib/sets/lists/gpufw/mi:1.4 --- src/distrib/sets/lists/gpufw/mi:1.3 Sat Sep 25 21:26:04 2021 +++ src/distrib/sets/lists/gpufw/mi Sun Dec 12 20:33:21 2021 @@ -1,8 +1,369 @@ -# $NetBSD: mi,v 1.3 2021/09/25 21:26:04 maya Exp $ +# $NetBSD: mi,v 1.4 2021/12/12 20:33:21 maya Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # ./etc/mtree/set.gpufwbase-gpufw +./libdata/firmware/amdgpubase-gpufw +./libdata/firmware/amdgpu/LICENSE.amdgpu base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_asd.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_gpu_info.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_mec.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_mec2.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_rlc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_sdma.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_smc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_sos.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_ta.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/arcturus_vcn.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/banks_k_2_smc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_ce.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_k_smc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_mc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_me.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_ce.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_mec.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_pfp.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_rlc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_sdma.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_sdma1.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_smc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_uvd.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/bonaire_vce.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_ce.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_me.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_mec.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_mec2.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_pfp.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_rlc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_sdma.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_sdma1.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_uvd.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/carrizo_vce.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_me.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_mec.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_mec2.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_pfp.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_rlc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_sdma.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_sdma1.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_smc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_uvd.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/fiji_vce.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/hainan_ce.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/hainan_k_smc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/hainan_mc.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/hainan_me.bin base-gpufw amdgpufirmware +./libdata/firmware/amdgpu/hain
CVS import: src/external/nvidia-firmware/nouveau/dist
Module Name:src Committed By: maya Date: Sun Dec 12 18:35:59 UTC 2021 Update of /cvsroot/src/external/nvidia-firmware/nouveau/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9744 Log Message: Import nvidia firmware from linux-firmware repository at commit: commit 2984e265cac6ef19a0de4fb21396fb87f45273d9 Merge: 6f5aada 359ab77 Author: Josh Boyer Date: Fri Sep 3 11:11:05 2021 -0400 Merge tag 'iwlwifi-fw-2021-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware into main Revert accidentally released untested binaries Signed-off-by: Josh Boyer Done by removing tegra related directories in linux-firmware. Status: Vendor Tag: LINUX-FIRMWARE Release Tags: linux-firmware-2021-09-03-2984e265 N src/external/nvidia-firmware/nouveau/dist/gk20a/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/fecs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/gpccs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/sw_bundle_init.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/sw_ctx.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/sw_method_init.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/sw_nonctx.bin N src/external/nvidia-firmware/nouveau/dist/gm200/acr/bl.bin N src/external/nvidia-firmware/nouveau/dist/gm200/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gm200/acr/ucode_unload.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/fecs_bl.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/fecs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/gpccs_bl.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/gpccs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/gpccs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/sw_bundle_init.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/sw_ctx.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/sw_method_init.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/sw_nonctx.bin N src/external/nvidia-firmware/nouveau/dist/gm204/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm204/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm204/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm204/gr/gpccs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm206/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gm206/acr/ucode_unload.bin N src/external/nvidia-firmware/nouveau/dist/gm206/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm206/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm206/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm206/gr/gpccs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/acr/bl.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/fecs_bl.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/fecs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/gpccs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/sw_bundle_init.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/sw_ctx.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/sw_nonctx.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/pmu/desc.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/pmu/image.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/pmu/sig.bin N src/external/nvidia-firmware/nouveau/dist/gp100/acr/bl.bin N src/external/nvidia-firmware/nouveau/dist/gp100/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gp100/acr/ucode_unload.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/fecs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/gpccs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/gpccs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/sw_bundle_init.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/sw_ctx.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/sw_method_init.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/sw_nonctx.bin N src/external/nvidia-firmware/nouveau/dist/gp102/acr/bl.bin N src/external/nvidia-firmware/nouveau/dist/gp102/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gp102/acr
CVS import: src/external/nvidia-firmware/nouveau/dist
Module Name:src Committed By: maya Date: Sun Dec 12 18:35:59 UTC 2021 Update of /cvsroot/src/external/nvidia-firmware/nouveau/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9744 Log Message: Import nvidia firmware from linux-firmware repository at commit: commit 2984e265cac6ef19a0de4fb21396fb87f45273d9 Merge: 6f5aada 359ab77 Author: Josh Boyer Date: Fri Sep 3 11:11:05 2021 -0400 Merge tag 'iwlwifi-fw-2021-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware into main Revert accidentally released untested binaries Signed-off-by: Josh Boyer Done by removing tegra related directories in linux-firmware. Status: Vendor Tag: LINUX-FIRMWARE Release Tags: linux-firmware-2021-09-03-2984e265 N src/external/nvidia-firmware/nouveau/dist/gk20a/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/fecs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/gpccs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/sw_bundle_init.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/sw_ctx.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/sw_method_init.bin N src/external/nvidia-firmware/nouveau/dist/gk20a/sw_nonctx.bin N src/external/nvidia-firmware/nouveau/dist/gm200/acr/bl.bin N src/external/nvidia-firmware/nouveau/dist/gm200/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gm200/acr/ucode_unload.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/fecs_bl.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/fecs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/gpccs_bl.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/gpccs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/gpccs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/sw_bundle_init.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/sw_ctx.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/sw_method_init.bin N src/external/nvidia-firmware/nouveau/dist/gm200/gr/sw_nonctx.bin N src/external/nvidia-firmware/nouveau/dist/gm204/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm204/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm204/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm204/gr/gpccs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm206/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gm206/acr/ucode_unload.bin N src/external/nvidia-firmware/nouveau/dist/gm206/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm206/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm206/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm206/gr/gpccs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/acr/bl.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/fecs_bl.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/fecs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/gpccs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/sw_bundle_init.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/sw_ctx.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/gr/sw_nonctx.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/pmu/desc.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/pmu/image.bin N src/external/nvidia-firmware/nouveau/dist/gm20b/pmu/sig.bin N src/external/nvidia-firmware/nouveau/dist/gp100/acr/bl.bin N src/external/nvidia-firmware/nouveau/dist/gp100/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gp100/acr/ucode_unload.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/fecs_data.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/fecs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/fecs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/gpccs_data.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/gpccs_inst.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/gpccs_sig.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/sw_bundle_init.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/sw_ctx.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/sw_method_init.bin N src/external/nvidia-firmware/nouveau/dist/gp100/gr/sw_nonctx.bin N src/external/nvidia-firmware/nouveau/dist/gp102/acr/bl.bin N src/external/nvidia-firmware/nouveau/dist/gp102/acr/ucode_load.bin N src/external/nvidia-firmware/nouveau/dist/gp102/acr
CVS import: src/external/amdgpu-firmware/amdgpu/dist
Module Name:src Committed By: maya Date: Sun Dec 12 16:40:08 UTC 2021 Update of /cvsroot/src/external/amdgpu-firmware/amdgpu/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5223 Log Message: Import AMDGPU firmware from linux-firmware repository at commit: commit 2984e265cac6ef19a0de4fb21396fb87f45273d9 Merge: 6f5aada 359ab77 Author: Josh Boyer Date: Fri Sep 3 11:11:05 2021 -0400 Merge tag 'iwlwifi-fw-2021-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware into main Revert accidentally released untested binaries Signed-off-by: Josh Boyer Cherry picking files using the following method: grep -R MODULE_FIRMWARE bsd/drm2/dist/drm/amd Replace macros as needed. Exclues navi10_mes.bin which doesn't exist on linux-firmware for some reason. Status: Vendor Tag: LINUX-FIRMWARE Release Tags: linux-firmware-2021-09-03-2984e265 N src/external/amdgpu-firmware/amdgpu/dist/arcturus_asd.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_gpu_info.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_mec2.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_sos.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_ta.bin N src/external/amdgpu-firmware/amdgpu/dist/banks_k_2_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_k_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_mc.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_me.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_me.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_mec2.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_me.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_mec2.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_mc.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_k_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_me.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_k_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_mc.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_me.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_me.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/si58_mc.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_me.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_mec2.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_sdma.bin N src/external/amdgpu-firmware
CVS import: src/external/amdgpu-firmware/amdgpu/dist
Module Name:src Committed By: maya Date: Sun Dec 12 16:40:08 UTC 2021 Update of /cvsroot/src/external/amdgpu-firmware/amdgpu/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5223 Log Message: Import AMDGPU firmware from linux-firmware repository at commit: commit 2984e265cac6ef19a0de4fb21396fb87f45273d9 Merge: 6f5aada 359ab77 Author: Josh Boyer Date: Fri Sep 3 11:11:05 2021 -0400 Merge tag 'iwlwifi-fw-2021-09-02' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware into main Revert accidentally released untested binaries Signed-off-by: Josh Boyer Cherry picking files using the following method: grep -R MODULE_FIRMWARE bsd/drm2/dist/drm/amd Replace macros as needed. Exclues navi10_mes.bin which doesn't exist on linux-firmware for some reason. Status: Vendor Tag: LINUX-FIRMWARE Release Tags: linux-firmware-2021-09-03-2984e265 N src/external/amdgpu-firmware/amdgpu/dist/arcturus_asd.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_gpu_info.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_mec2.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_sos.bin N src/external/amdgpu-firmware/amdgpu/dist/arcturus_ta.bin N src/external/amdgpu-firmware/amdgpu/dist/banks_k_2_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_k_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_mc.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_me.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/bonaire_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_me.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_mec2.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/carrizo_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_me.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_mec2.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/fiji_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_mc.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_k_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_me.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/hainan_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_k_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_mc.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_me.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/hawaii_smc.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_me.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/si58_mc.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_sdma.bin N src/external/amdgpu-firmware/amdgpu/dist/kabini_sdma1.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_ce.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_me.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_mec.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_mec2.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_pfp.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_rlc.bin N src/external/amdgpu-firmware/amdgpu/dist/kaveri_sdma.bin N src/external/amdgpu-firmware
CVS commit: src/distrib/amd64
Module Name:src
Committed By: maya
Date: Fri Oct 8 20:24:06 UTC 2021
Modified Files:
src/distrib/amd64: Makefile
Added Files:
src/distrib/amd64/installimage-bios: Makefile boot.cfg.in etc.rc
etc.ttys install.sh spec.inst
Log Message:
Restore having a BIOS-only amd64 USB image.
Several people reported having hardware that struggles booting the mix
EFI+BIOS image, and it's better to offer them a working image.
Keeping the EFI image as having the obvious name, this is going to become
more likely to work by default as newer hardware may not support BIOS boot.
(XXX pullup-9)
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/amd64/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/installimage-bios/Makefile \
src/distrib/amd64/installimage-bios/boot.cfg.in \
src/distrib/amd64/installimage-bios/etc.rc \
src/distrib/amd64/installimage-bios/etc.ttys \
src/distrib/amd64/installimage-bios/install.sh \
src/distrib/amd64/installimage-bios/spec.inst
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/Makefile
diff -u src/distrib/amd64/Makefile:1.14 src/distrib/amd64/Makefile:1.15
--- src/distrib/amd64/Makefile:1.14 Wed May 27 22:27:58 2020
+++ src/distrib/amd64/Makefile Fri Oct 8 20:24:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/05/27 22:27:58 maya Exp $
+# $NetBSD: Makefile,v 1.15 2021/10/08 20:24:06 maya Exp $
.include
@@ -14,6 +14,7 @@ SUBDIR+= .WAIT
SUBDIR+= cdroms
SUBDIR+= liveimage
SUBDIR+= installimage
+SUBDIR+= installimage-bios
TARGETS+= release
iso_image:
@@ -24,5 +25,6 @@ live_image:
install_image:
${MAKEDIRTARGET} installimage install_image
+ ${MAKEDIRTARGET} installimage-bios install_image
.include
Added files:
Index: src/distrib/amd64/installimage-bios/Makefile
diff -u /dev/null src/distrib/amd64/installimage-bios/Makefile:1.1
--- /dev/null Fri Oct 8 20:24:06 2021
+++ src/distrib/amd64/installimage-bios/Makefile Fri Oct 8 20:24:06 2021
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.1 2021/10/08 20:24:06 maya Exp $
+
+.include
+
+INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-bios-install # gives ${IMGBASE}.img
+
+INSTIMAGEMB?= 1800 # for all installation binaries
+
+PRIMARY_BOOT= bootxx_ffsv1
+SECONDARY_BOOT= boot
+SECONDARY_BOOT_ARG= # unnecessary
+
+USE_MBR= yes
+
+CLEANFILES+= boot.cfg
+
+prepare_md_post:
+ ${TOOL_SED} \
+ -e "s/@@MACHINE@@/${MACHINE}/"\
+ -e "s/@@VERSION@@/${DISTRIBVER}/"\
+ < ${.CURDIR}/boot.cfg.in > boot.cfg
+
+DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
+SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
+
+SPEC_EXTRA= ${.CURDIR}/spec.inst
+IMGFILE_EXTRA=\
+ ${.CURDIR}/etc.ttys etc/ttys \
+ ${.CURDIR}/etc.rc etc/rc\
+ ${.CURDIR}/install.sh .\
+ ${.OBJDIR}/boot.cfg .\
+ ${SYSINSTDIR}/sysinstmsgs.de .\
+ ${SYSINSTDIR}/sysinstmsgs.es .\
+ ${SYSINSTDIR}/sysinstmsgs.fr .\
+ ${SYSINSTDIR}/sysinstmsgs.pl .\
+ ${SYSINSTDIR}/sysinst .
+
+.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
Index: src/distrib/amd64/installimage-bios/boot.cfg.in
diff -u /dev/null src/distrib/amd64/installimage-bios/boot.cfg.in:1.1
--- /dev/null Fri Oct 8 20:24:06 2021
+++ src/distrib/amd64/installimage-bios/boot.cfg.in Fri Oct 8 20:24:06 2021
@@ -0,0 +1,9 @@
+banner=Welcome to the NetBSD/@@MACHINE@@ @@VERSION@@ installation image
+banner
+banner=
+banner=If you encounter a problem while booting, report a bug at
+banner=https://www.NetBSD.org/.
+menu=Install NetBSD:boot netbsd
+menu=Drop to boot prompt:prompt
+timeout=30
+clear=1
Index: src/distrib/amd64/installimage-bios/etc.rc
diff -u /dev/null src/distrib/amd64/installimage-bios/etc.rc:1.1
--- /dev/null Fri Oct 8 20:24:06 2021
+++ src/distrib/amd64/installimage-bios/etc.rc Fri Oct 8 20:24:06 2021
@@ -0,0 +1,49 @@
+# $NetBSD: etc.rc,v 1.1 2021/10/08 20:24:06 maya Exp $
+#
+# Copyright (c) 1997 Perry E. Metzger
+# Copyright (c) 1994 Christopher G. Demetriou
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#must display the following acknowledgement:
+# This product includes software developed for the
+#
CVS commit: src/distrib/amd64
Module Name:src Committed By: maya Date: Fri Oct 8 20:24:06 UTC 2021 Modified Files: src/distrib/amd64: Makefile Added Files: src/distrib/amd64/installimage-bios: Makefile boot.cfg.in etc.rc etc.ttys install.sh spec.inst Log Message: Restore having a BIOS-only amd64 USB image. Several people reported having hardware that struggles booting the mix EFI+BIOS image, and it's better to offer them a working image. Keeping the EFI image as having the obvious name, this is going to become more likely to work by default as newer hardware may not support BIOS boot. (XXX pullup-9) To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/distrib/amd64/Makefile cvs rdiff -u -r0 -r1.1 src/distrib/amd64/installimage-bios/Makefile \ src/distrib/amd64/installimage-bios/boot.cfg.in \ src/distrib/amd64/installimage-bios/etc.rc \ src/distrib/amd64/installimage-bios/etc.ttys \ src/distrib/amd64/installimage-bios/install.sh \ src/distrib/amd64/installimage-bios/spec.inst Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: maya
Date: Sun Sep 26 15:52:41 UTC 2021
Modified Files:
src/etc: Makefile
src/external/nvidia-firmware: Makefile
src/share/mk: bsd.README bsd.own.mk
src/sys/dev/microcode/radeon: Makefile
src/usr.sbin/sysinst: Makefile.inc defs.h util.c
Log Message:
Restore MKNOUVEAUFIRMWARE and MKRADEONFIRMWARE and make gpufw set unconditional
Simplifies logic.
(Second commit - first one was partial)
Restoring MK* requested by mrg on tech-kern discussion
https://mail-index.netbsd.org/tech-kern/2021/09/25/msg027695.html
To generate a diff of this commit:
cvs rdiff -u -r1.451 -r1.452 src/etc/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/nvidia-firmware/Makefile
cvs rdiff -u -r1.417 -r1.418 src/share/mk/bsd.README
cvs rdiff -u -r1.1261 -r1.1262 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/microcode/radeon/Makefile
cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/sysinst/Makefile.inc
cvs rdiff -u -r1.73 -r1.74 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.60 -r1.61 src/usr.sbin/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.451 src/etc/Makefile:1.452
--- src/etc/Makefile:1.451 Sat Sep 25 08:54:30 2021
+++ src/etc/Makefile Sun Sep 26 15:52:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.451 2021/09/25 08:54:30 maya Exp $
+# $NetBSD: Makefile,v 1.452 2021/09/26 15:52:40 maya Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -368,16 +368,13 @@ install-etc-files: .PHONY .MAKE check_DE
# Install var/db/obsolete set lists; this is performed by "make build"
#
OBSOLETE.dir= ${.OBJDIR}/obsolete.dir
-OBSOLETE.files= base comp etc games man misc rescue text
+OBSOLETE.files= base comp etc games gpufw man misc rescue text
.if ${MKDEBUG} != "no"
OBSOLETE.files+= debug
.endif
.if ${MKDTB} != "no"
OBSOLETE.files+= dtb
.endif
-.if ${MKGPUFIRMWARE} != "no"
-OBSOLETE.files+= gpufw
-.endif
.if ${MKKMOD} != "no"
OBSOLETE.files+= modules
.endif
Index: src/external/nvidia-firmware/Makefile
diff -u src/external/nvidia-firmware/Makefile:1.4 src/external/nvidia-firmware/Makefile:1.5
--- src/external/nvidia-firmware/Makefile:1.4 Sat Sep 25 08:54:30 2021
+++ src/external/nvidia-firmware/Makefile Sun Sep 26 15:52:40 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2021/09/25 08:54:30 maya Exp $
+# $NetBSD: Makefile,v 1.5 2021/09/26 15:52:40 maya Exp $
.include
-.if ${MKGPUFIRMWARE} != "no"
+.if ${MKNOUVEAUFIRMWARE} != "no"
SUBDIR+= gm20x
.endif
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.417 src/share/mk/bsd.README:1.418
--- src/share/mk/bsd.README:1.417 Sat Sep 25 08:54:30 2021
+++ src/share/mk/bsd.README Sun Sep 26 15:52:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.417 2021/09/25 08:54:30 maya Exp $
+# $NetBSD: bsd.README,v 1.418 2021/09/26 15:52:40 maya Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -218,10 +218,6 @@ MKFIRMWARE If not "no", install the
Default: yes on amd64, cobalt, evbarm evbmips, evbppc, hpcarm,
hppa, i386, mac68k, macppc, sandpoint, and sparc64, no elsewhere.
-MKGPUFIRMWARE If not "no", install the /libdata/firmware directory,
- which is necessary for GPU drivers.
- Default: yes on amd64, i386, evbarm. No elsewhere.
-
MKGCC If "no", don't build gcc(1) or any of the GCC-related
libraries (libgcc, libobjc, libstdc++).
Default: yes
@@ -373,6 +369,10 @@ MKNLS If "no", don't build or install t
definition files.
Default: yes
+MKNOUVEAUFIRMWARE If "yes", install the /libdata/firmware/nouveau directory,
+ which is necessary for the nouveau DRM driver.
+ Default: yes on amd64 and i386, no elsewhere.
+
MKNPF If "no", don't build or install the NPF and its modules.
Default: yes
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1261 src/share/mk/bsd.own.mk:1.1262
--- src/share/mk/bsd.own.mk:1.1261 Sat Sep 25 08:54:30 2021
+++ src/share/mk/bsd.own.mk Sun Sep 26 15:52:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1261 2021/09/25 08:54:30 maya Exp $
+# $NetBSD: bsd.own.mk,v 1.1262 2021/09/26 15:52:40 maya Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1236,9 +1236,12 @@ MKFIRMWARE.sandpoint= yes
MKFIRMWARE.sparc64= yes
# Only install the GPU firmware on DRM-happy systems.
-MKGPUFIRMWARE.x86_64= yes
-MKGPUFIRMWARE.i386= yes
-MKGPUFIRMWARE.aarch64= yes
+MKNOUVEAUFIRMWARE.x86_64= yes
+MKNOUVEAUFIRMWARE.i386= yes
+MKNOUVEAUFIRMWARE.aarch64= yes
+MKRADEONFIRMWARE.x86_64= yes
+MKRADEONFIRMWARE.i386= yes
+MKRADEONFIRMWARE.aarch64= yes
# Only install the tegra firmware on evb
CVS commit: src
Module Name:src Committed By: maya Date: Sun Sep 26 15:52:41 UTC 2021 Modified Files: src/etc: Makefile src/external/nvidia-firmware: Makefile src/share/mk: bsd.README bsd.own.mk src/sys/dev/microcode/radeon: Makefile src/usr.sbin/sysinst: Makefile.inc defs.h util.c Log Message: Restore MKNOUVEAUFIRMWARE and MKRADEONFIRMWARE and make gpufw set unconditional Simplifies logic. (Second commit - first one was partial) Restoring MK* requested by mrg on tech-kern discussion https://mail-index.netbsd.org/tech-kern/2021/09/25/msg027695.html To generate a diff of this commit: cvs rdiff -u -r1.451 -r1.452 src/etc/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/nvidia-firmware/Makefile cvs rdiff -u -r1.417 -r1.418 src/share/mk/bsd.README cvs rdiff -u -r1.1261 -r1.1262 src/share/mk/bsd.own.mk cvs rdiff -u -r1.7 -r1.8 src/sys/dev/microcode/radeon/Makefile cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/sysinst/Makefile.inc cvs rdiff -u -r1.73 -r1.74 src/usr.sbin/sysinst/defs.h cvs rdiff -u -r1.60 -r1.61 src/usr.sbin/sysinst/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src
Committed By: maya
Date: Sat Sep 25 21:26:04 UTC 2021
Modified Files:
src/distrib/common/bootimage: Makefile.installimage
src/distrib/sets: sets.subr
src/distrib/sets/lists/gpufw: mi
Log Message:
Restore MKNOUVEAUFIRMWARE and MKRADEONFIRMWARE and make gpufw set unconditional
Simplifies logic.
Restoring MK* requested by mrg on tech-kern discussion
https://mail-index.netbsd.org/tech-kern/2021/09/25/msg027695.html
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r1.196 -r1.197 src/distrib/sets/sets.subr
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/gpufw/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/bootimage/Makefile.installimage
diff -u src/distrib/common/bootimage/Makefile.installimage:1.9 src/distrib/common/bootimage/Makefile.installimage:1.10
--- src/distrib/common/bootimage/Makefile.installimage:1.9 Sat Sep 25 08:54:29 2021
+++ src/distrib/common/bootimage/Makefile.installimage Sat Sep 25 21:26:03 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.installimage,v 1.9 2021/09/25 08:54:29 maya Exp $
+# $NetBSD: Makefile.installimage,v 1.10 2021/09/25 21:26:03 maya Exp $
#
# Common Makefile to create a bootable installation image for USB flash etc.
#
@@ -32,10 +32,7 @@ IMAGEMB= ${INSTIMAGEMB}
SWAPMB= 0 # no swap
KERN_SET?= kern-GENERIC
-SETS?= modules base etc
-.if ${MKGPUFIRMWARE:Uno} != "no"
-SETS+= gpufw
-.endif
+SETS?= gpufw modules base etc
FSTAB_IN?= ${NETBSDSRCDIR}/distrib/common/bootimage/fstab.install.in
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.196 src/distrib/sets/sets.subr:1.197
--- src/distrib/sets/sets.subr:1.196 Sat Sep 25 08:54:30 2021
+++ src/distrib/sets/sets.subr Sat Sep 25 21:26:03 2021
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.196 2021/09/25 08:54:30 maya Exp $
+# $NetBSD: sets.subr,v 1.197 2021/09/25 21:26:03 maya Exp $
#
#
@@ -143,11 +143,6 @@ else
module=yes
modset="modules"
fi
-if [ "${MKGPUFIRMWARE}" = "no" ]; then
- gpufwset=""
-else
- gpufwset="gpufw"
-fi
if [ "${MKATF}" = "no" ]; then
testset=""
else
@@ -176,7 +171,7 @@ stlib=$shlib
if [ "${MKPIC}" = "no" ]; then
shlib=no
fi
-nlists="base comp $debugset $dtbset etc games $gpufwset man misc $modset rescue $testset text"
+nlists="base comp $debugset $dtbset etc games gpufw man misc $modset rescue $testset text"
xlists="xbase xcomp $xdebugset xetc xfont xserver"
extlists="extbase extcomp extetc"
@@ -197,7 +192,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.196 2021/09/25 08:54:30 maya Exp $
+# # $NetBSD: sets.subr,v 1.197 2021/09/25 21:26:03 maya Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
Index: src/distrib/sets/lists/gpufw/mi
diff -u src/distrib/sets/lists/gpufw/mi:1.2 src/distrib/sets/lists/gpufw/mi:1.3
--- src/distrib/sets/lists/gpufw/mi:1.2 Sat Sep 25 21:18:22 2021
+++ src/distrib/sets/lists/gpufw/mi Sat Sep 25 21:26:04 2021
@@ -1,171 +1,171 @@
-# $NetBSD: mi,v 1.2 2021/09/25 21:18:22 maya Exp $
+# $NetBSD: mi,v 1.3 2021/09/25 21:26:04 maya Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
./etc/mtree/set.gpufwbase-gpufw
-./libdata/firmware/nouveau/nvidia/LICENCE.nvidiabase-gpufw gpufirmware
-./libdata/firmware/nouveau/nvidia/gm206/fecs_data.bin base-gpufw gpufirmware
-./libdata/firmware/nouveau/nvidia/gm206/fecs_inst.bin base-gpufw gpufirmware
-./libdata/firmware/nouveau/nvidia/gm206/gpccs_data.bin base-gpufw gpufirmware
-./libdata/firmware/nouveau/nvidia/gm206/gpccs_inst.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/ARUBA_me.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/ARUBA_pfp.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/ARUBA_rlc.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BARTS_mc.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BARTS_me.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BARTS_pfp.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BARTS_smc.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BONAIRE_ce.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BONAIRE_mc.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BONAIRE_mc2.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BONAIRE_me.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BONAIRE_mec.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BONAIRE_pfp.bin base-gpufw gpufirmware
-./libdata/firmware/radeon/BONAIRE_rlc.bin base-gpufw
CVS commit: src/distrib
Module Name:src Committed By: maya Date: Sat Sep 25 21:26:04 UTC 2021 Modified Files: src/distrib/common/bootimage: Makefile.installimage src/distrib/sets: sets.subr src/distrib/sets/lists/gpufw: mi Log Message: Restore MKNOUVEAUFIRMWARE and MKRADEONFIRMWARE and make gpufw set unconditional Simplifies logic. Restoring MK* requested by mrg on tech-kern discussion https://mail-index.netbsd.org/tech-kern/2021/09/25/msg027695.html To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/common/bootimage/Makefile.installimage cvs rdiff -u -r1.196 -r1.197 src/distrib/sets/sets.subr cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/gpufw/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/gpufw
Module Name:src Committed By: maya Date: Sat Sep 25 21:18:22 UTC 2021 Modified Files: src/distrib/sets/lists/gpufw: mi Log Message: Remove duplicate line - also appears in base/mi. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/gpufw/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/gpufw/mi diff -u src/distrib/sets/lists/gpufw/mi:1.1 src/distrib/sets/lists/gpufw/mi:1.2 --- src/distrib/sets/lists/gpufw/mi:1.1 Sat Sep 25 08:54:30 2021 +++ src/distrib/sets/lists/gpufw/mi Sat Sep 25 21:18:22 2021 @@ -1,10 +1,9 @@ -# $NetBSD: mi,v 1.1 2021/09/25 08:54:30 maya Exp $ +# $NetBSD: mi,v 1.2 2021/09/25 21:18:22 maya Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # ./etc/mtree/set.gpufwbase-gpufw ./libdata/firmware/nouveau/nvidia/LICENCE.nvidiabase-gpufw gpufirmware -./libdata/firmware/nouveau/nvidia/gm206 base-gpufw ./libdata/firmware/nouveau/nvidia/gm206/fecs_data.bin base-gpufw gpufirmware ./libdata/firmware/nouveau/nvidia/gm206/fecs_inst.bin base-gpufw gpufirmware ./libdata/firmware/nouveau/nvidia/gm206/gpccs_data.bin base-gpufw gpufirmware
CVS commit: src/distrib/sets/lists/gpufw
Module Name:src Committed By: maya Date: Sat Sep 25 21:18:22 UTC 2021 Modified Files: src/distrib/sets/lists/gpufw: mi Log Message: Remove duplicate line - also appears in base/mi. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/gpufw/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: maya Date: Sat Sep 25 17:55:37 UTC 2021 Modified Files: src/distrib/sets/lists/debug: module.md.amd64 module.md.i386 src/distrib/sets/lists/modules: md.amd64 md.i386 src/sys/modules: Makefile Log Message: Disable drmkms module builds. They haven't been functional (and won't be before fixing genfb abi). In a new drm update, we haven't prioritized fixing the build either. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug/module.md.amd64 cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/debug/module.md.i386 cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.255 -r1.256 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/module.md.amd64 diff -u src/distrib/sets/lists/debug/module.md.amd64:1.5 src/distrib/sets/lists/debug/module.md.amd64:1.6 --- src/distrib/sets/lists/debug/module.md.amd64:1.5 Thu Mar 25 21:37:10 2021 +++ src/distrib/sets/lists/debug/module.md.amd64 Sat Sep 25 17:55:37 2021 @@ -1,4 +1,4 @@ -# $NetBSD: module.md.amd64,v 1.5 2021/03/25 21:37:10 nia Exp $ +# $NetBSD: module.md.amd64,v 1.6 2021/09/25 17:55:37 maya Exp $ ./usr/libdata/debug/@MODULEDIR@/acpiacadmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/acpibatmodules-base-kernel kmod,debug @@ -105,14 +105,14 @@ ./usr/libdata/debug/@MODULEDIR@/cxdtv/cxdtv.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/drmmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/drm/drm.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkmsmodules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms/drmkms.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_agp modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_agp/drmkms_agp.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_linux modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_linux/drmkms_linux.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_pci modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/drmkms_pci/drmkms_pci.kmod.debug modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/drmkmsmodules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms/drmkms.kmod.debug modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_agp modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_agp/drmkms_agp.kmod.debug modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_linux modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_linux/drmkms_linux.kmod.debug modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_pci modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/drmkms_pci/drmkms_pci.kmod.debug modules-obsolete obsolete ./usr/libdata/debug/@MODULEDIR@/dtrace_syscall_linux modules-base-kernel kmod,dtrace,debug ./usr/libdata/debug/@MODULEDIR@/dtrace_syscall_linux/dtrace_syscall_linux.kmod.debug modules-base-kernel kmod,dtrace,debug ./usr/libdata/debug/@MODULEDIR@/dtrace_syscall_linux32 modules-base-kernel kmod,dtrace,debug @@ -149,8 +149,8 @@ ./usr/libdata/debug/@MODULEDIR@/hpqlb/hpqlb.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/i915drmmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/i915drm/i915drm.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/i915drmkms modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/i915drmkms/i915drmkms.kmod.debug modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/i915drmkms modules-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/i915drmkms/i915drmkms.kmod.debug modules-obsolete obsolete ./usr/libdata/debug/@MODULEDIR@/ichsmbmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/ichsmb/ichsmb.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/if_iavfmodules-base-kernel kmod,debug Index: src/distrib/sets/lists/debug/module.md.i386 diff -u src/distrib/sets/lists/debug/module.md.i386:1.3 src/distrib/sets/lists/debug/module.md.i386:1.4 --- src/distrib/sets/lists/debug/module.md.i386:1.3 Thu Mar 25 21:37:10 2021 +++ src/distrib/sets/lists/debug/module.md.i386 Sat Sep 25 17:55:37 2021 @@ -1,4 +1,4 @@ -# $NetBSD: module.md.i386,v 1.3 2021/03/25 21:37:10 nia Exp $ +# $NetBSD: module.md.i386,v 1.4 2021/09/25 17:55:37 maya Exp $ ./usr/libdata/debug/@MODULEDIR@/acpiacadmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/acpiacad
CVS commit: src
Module Name:src Committed By: maya Date: Sat Sep 25 17:55:37 UTC 2021 Modified Files: src/distrib/sets/lists/debug: module.md.amd64 module.md.i386 src/distrib/sets/lists/modules: md.amd64 md.i386 src/sys/modules: Makefile Log Message: Disable drmkms module builds. They haven't been functional (and won't be before fixing genfb abi). In a new drm update, we haven't prioritized fixing the build either. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug/module.md.amd64 cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/debug/module.md.i386 cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.255 -r1.256 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: maya
Date: Sat Sep 25 08:54:31 UTC 2021
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/common/bootimage: Makefile.bootimage Makefile.installimage
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/notes/amd64: contents
src/distrib/notes/evbarm: contents
src/distrib/notes/i386: contents
src/distrib/sets: README maketars regpkgset sets.subr
src/distrib/sets/lists/base: mi
src/distrib/utils/embedded: mkimage
src/etc: Makefile
src/external/nvidia-firmware: Makefile
src/share/mk: bsd.README bsd.own.mk
src/sys/dev/microcode/radeon: Makefile
src/usr.sbin/sysinst: Makefile.inc defs.h msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl util.c
src/usr.sbin/sysinst/arch/amd64: md.h
src/usr.sbin/sysinst/arch/evbarm: md.h
src/usr.sbin/sysinst/arch/i386: md.h
Added Files:
src/distrib/sets/lists/gpufw: mi
Log Message:
Move DRM-driver firmware from base to its own set, gpufw
This set is only installed on amd64,i386,evbarm.
This set is installed on minimal installs and on install media, in
case someone needs it for basic driver functionality.
Comments:
Switched to a single MK tunable for it - that is probably unneeded.
An upcoming DRM update will include even fatter firmware, and we'd
like to minimize the impact of it.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.28 -r1.29 src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.8 -r1.9 src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r1.41 -r1.42 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.12 -r1.13 src/distrib/notes/amd64/contents
cvs rdiff -u -r1.14 -r1.15 src/distrib/notes/evbarm/contents
cvs rdiff -u -r1.34 -r1.35 src/distrib/notes/i386/contents
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/README
cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/maketars
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/regpkgset
cvs rdiff -u -r1.195 -r1.196 src/distrib/sets/sets.subr
cvs rdiff -u -r1.1283 -r1.1284 src/distrib/sets/lists/base/mi
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/gpufw/mi
cvs rdiff -u -r1.77 -r1.78 src/distrib/utils/embedded/mkimage
cvs rdiff -u -r1.450 -r1.451 src/etc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/nvidia-firmware/Makefile
cvs rdiff -u -r1.416 -r1.417 src/share/mk/bsd.README
cvs rdiff -u -r1.1260 -r1.1261 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/microcode/radeon/Makefile
cvs rdiff -u -r1.41 -r1.42 src/usr.sbin/sysinst/Makefile.inc
cvs rdiff -u -r1.72 -r1.73 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/sysinst/msg.mi.de
cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/sysinst/msg.mi.en \
src/usr.sbin/sysinst/msg.mi.pl
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/sysinst/msg.mi.es
cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/sysinst/msg.mi.fr
cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/sysinst/util.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/amd64/md.h
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/evbarm/md.h
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/i386/md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.26 src/distrib/amd64/cdroms/Makefile.cdrom:1.27
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.26 Sun Mar 7 03:55:47 2021
+++ src/distrib/amd64/cdroms/Makefile.cdrom Sat Sep 25 08:54:29 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.26 2021/03/07 03:55:47 dbj Exp $
+# $NetBSD: Makefile.cdrom,v 1.27 2021/09/25 08:54:29 maya Exp $
.include
.include
@@ -17,7 +17,7 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.$
CDINSTKERNEL= ../../instkernel
CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true
-CD_SETS= base etc
+CD_SETS= base etc gpufw
.if ${MKKMOD} != "no"
CD_SETS+= modules
.endif
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.28 src/distrib/common/bootimage/Makefile.bootimage:1.29
--- src/distrib/common/bootimage/Makefile.bootimage:1.28 Sat Jul 24 13:59:28 2021
+++ src/distrib/common/bootimage/Makefile.bootimage Sat Sep 25 08:54:29 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.28 2021/07/24 13:59:28 jmcneill Exp $
+# $NetBSD: Makefile.bootimage,v 1.29 2021/09/25 08:54:29 maya Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -71,8 +71,8 @@
# (default: kern-GENERIC)
# SETS
# binary sets that should be extracted into image
-# (default: modules base etc comp games man misc rescue tests
-# text xbase xcomp xetc xfont xserver)
+# (default: modules base etc comp games gpufw man misc
+# rescue tests text xbase xcomp xetc xfo
CVS commit: src
Module Name:src Committed By: maya Date: Sat Sep 25 08:54:31 UTC 2021 Modified Files: src/distrib/amd64/cdroms: Makefile.cdrom src/distrib/common/bootimage: Makefile.bootimage Makefile.installimage src/distrib/i386/cdroms: Makefile.cdrom src/distrib/notes/amd64: contents src/distrib/notes/evbarm: contents src/distrib/notes/i386: contents src/distrib/sets: README maketars regpkgset sets.subr src/distrib/sets/lists/base: mi src/distrib/utils/embedded: mkimage src/etc: Makefile src/external/nvidia-firmware: Makefile src/share/mk: bsd.README bsd.own.mk src/sys/dev/microcode/radeon: Makefile src/usr.sbin/sysinst: Makefile.inc defs.h msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl util.c src/usr.sbin/sysinst/arch/amd64: md.h src/usr.sbin/sysinst/arch/evbarm: md.h src/usr.sbin/sysinst/arch/i386: md.h Added Files: src/distrib/sets/lists/gpufw: mi Log Message: Move DRM-driver firmware from base to its own set, gpufw This set is only installed on amd64,i386,evbarm. This set is installed on minimal installs and on install media, in case someone needs it for basic driver functionality. Comments: Switched to a single MK tunable for it - that is probably unneeded. An upcoming DRM update will include even fatter firmware, and we'd like to minimize the impact of it. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/distrib/amd64/cdroms/Makefile.cdrom cvs rdiff -u -r1.28 -r1.29 src/distrib/common/bootimage/Makefile.bootimage cvs rdiff -u -r1.8 -r1.9 src/distrib/common/bootimage/Makefile.installimage cvs rdiff -u -r1.41 -r1.42 src/distrib/i386/cdroms/Makefile.cdrom cvs rdiff -u -r1.12 -r1.13 src/distrib/notes/amd64/contents cvs rdiff -u -r1.14 -r1.15 src/distrib/notes/evbarm/contents cvs rdiff -u -r1.34 -r1.35 src/distrib/notes/i386/contents cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/README cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/maketars cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/regpkgset cvs rdiff -u -r1.195 -r1.196 src/distrib/sets/sets.subr cvs rdiff -u -r1.1283 -r1.1284 src/distrib/sets/lists/base/mi cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/gpufw/mi cvs rdiff -u -r1.77 -r1.78 src/distrib/utils/embedded/mkimage cvs rdiff -u -r1.450 -r1.451 src/etc/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/nvidia-firmware/Makefile cvs rdiff -u -r1.416 -r1.417 src/share/mk/bsd.README cvs rdiff -u -r1.1260 -r1.1261 src/share/mk/bsd.own.mk cvs rdiff -u -r1.6 -r1.7 src/sys/dev/microcode/radeon/Makefile cvs rdiff -u -r1.41 -r1.42 src/usr.sbin/sysinst/Makefile.inc cvs rdiff -u -r1.72 -r1.73 src/usr.sbin/sysinst/defs.h cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/sysinst/msg.mi.de cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/sysinst/msg.mi.en \ src/usr.sbin/sysinst/msg.mi.pl cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/sysinst/msg.mi.es cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/sysinst/msg.mi.fr cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/sysinst/util.c cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/amd64/md.h cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/evbarm/md.h cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/i386/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-modesetting/dist
Module Name:xsrc Committed By: maya Date: Sat Aug 28 13:30:25 UTC 2021 Removed Files: xsrc/external/mit/xf86-video-modesetting/dist: COPYING ChangeLog INSTALL Makefile.am Makefile.in README aclocal.m4 config.guess config.h.in config.sub configure configure.ac depcomp install-sh ltmain.sh missing xsrc/external/mit/xf86-video-modesetting/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 xsrc/external/mit/xf86-video-modesetting/dist/man: Makefile.am Makefile.in modesetting.man xsrc/external/mit/xf86-video-modesetting/dist/src: Makefile.am Makefile.in compat-api.h driver.c driver.h drmmode_display.c drmmode_display.h Log Message: Remove unused standalone modesetting driver. We use the one embedded into xorg-server. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/COPYING \ xsrc/external/mit/xf86-video-modesetting/dist/ChangeLog \ xsrc/external/mit/xf86-video-modesetting/dist/INSTALL \ xsrc/external/mit/xf86-video-modesetting/dist/Makefile.am \ xsrc/external/mit/xf86-video-modesetting/dist/Makefile.in \ xsrc/external/mit/xf86-video-modesetting/dist/README \ xsrc/external/mit/xf86-video-modesetting/dist/aclocal.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/config.guess \ xsrc/external/mit/xf86-video-modesetting/dist/config.h.in \ xsrc/external/mit/xf86-video-modesetting/dist/config.sub \ xsrc/external/mit/xf86-video-modesetting/dist/configure \ xsrc/external/mit/xf86-video-modesetting/dist/configure.ac \ xsrc/external/mit/xf86-video-modesetting/dist/depcomp \ xsrc/external/mit/xf86-video-modesetting/dist/install-sh \ xsrc/external/mit/xf86-video-modesetting/dist/ltmain.sh \ xsrc/external/mit/xf86-video-modesetting/dist/missing cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/libtool.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/ltoptions.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/ltsugar.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/ltversion.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/lt~obsolete.m4 cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/man/Makefile.am \ xsrc/external/mit/xf86-video-modesetting/dist/man/Makefile.in \ xsrc/external/mit/xf86-video-modesetting/dist/man/modesetting.man cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/src/Makefile.am \ xsrc/external/mit/xf86-video-modesetting/dist/src/Makefile.in \ xsrc/external/mit/xf86-video-modesetting/dist/src/compat-api.h \ xsrc/external/mit/xf86-video-modesetting/dist/src/driver.h \ xsrc/external/mit/xf86-video-modesetting/dist/src/drmmode_display.h cvs rdiff -u -r1.2 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/src/driver.c \ xsrc/external/mit/xf86-video-modesetting/dist/src/drmmode_display.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-modesetting/dist
Module Name:xsrc Committed By: maya Date: Sat Aug 28 13:30:25 UTC 2021 Removed Files: xsrc/external/mit/xf86-video-modesetting/dist: COPYING ChangeLog INSTALL Makefile.am Makefile.in README aclocal.m4 config.guess config.h.in config.sub configure configure.ac depcomp install-sh ltmain.sh missing xsrc/external/mit/xf86-video-modesetting/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 xsrc/external/mit/xf86-video-modesetting/dist/man: Makefile.am Makefile.in modesetting.man xsrc/external/mit/xf86-video-modesetting/dist/src: Makefile.am Makefile.in compat-api.h driver.c driver.h drmmode_display.c drmmode_display.h Log Message: Remove unused standalone modesetting driver. We use the one embedded into xorg-server. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/COPYING \ xsrc/external/mit/xf86-video-modesetting/dist/ChangeLog \ xsrc/external/mit/xf86-video-modesetting/dist/INSTALL \ xsrc/external/mit/xf86-video-modesetting/dist/Makefile.am \ xsrc/external/mit/xf86-video-modesetting/dist/Makefile.in \ xsrc/external/mit/xf86-video-modesetting/dist/README \ xsrc/external/mit/xf86-video-modesetting/dist/aclocal.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/config.guess \ xsrc/external/mit/xf86-video-modesetting/dist/config.h.in \ xsrc/external/mit/xf86-video-modesetting/dist/config.sub \ xsrc/external/mit/xf86-video-modesetting/dist/configure \ xsrc/external/mit/xf86-video-modesetting/dist/configure.ac \ xsrc/external/mit/xf86-video-modesetting/dist/depcomp \ xsrc/external/mit/xf86-video-modesetting/dist/install-sh \ xsrc/external/mit/xf86-video-modesetting/dist/ltmain.sh \ xsrc/external/mit/xf86-video-modesetting/dist/missing cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/libtool.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/ltoptions.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/ltsugar.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/ltversion.m4 \ xsrc/external/mit/xf86-video-modesetting/dist/m4/lt~obsolete.m4 cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/man/Makefile.am \ xsrc/external/mit/xf86-video-modesetting/dist/man/Makefile.in \ xsrc/external/mit/xf86-video-modesetting/dist/man/modesetting.man cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/src/Makefile.am \ xsrc/external/mit/xf86-video-modesetting/dist/src/Makefile.in \ xsrc/external/mit/xf86-video-modesetting/dist/src/compat-api.h \ xsrc/external/mit/xf86-video-modesetting/dist/src/driver.h \ xsrc/external/mit/xf86-video-modesetting/dist/src/drmmode_display.h cvs rdiff -u -r1.2 -r0 \ xsrc/external/mit/xf86-video-modesetting/dist/src/driver.c \ xsrc/external/mit/xf86-video-modesetting/dist/src/drmmode_display.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: maya
Date: Sat Aug 28 08:56:10 UTC 2021
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Removed Files:
src/external/mit/xorg/server/drivers/xf86-video-modesetting: Makefile
Log Message:
Remove unused xf86-video-modesetting.
In newer xorg-server, it is integrated into the server
No users of old xorg-server use modesetting.
It requires drm drivers, but also, the sole possible user of old
xorg-server that could be handled by this Makefile is netwinder,
but it has a different ${MACHINE} and so seems like it never built the
driver.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.102 src/external/mit/xorg/server/drivers/Makefile:1.103
--- src/external/mit/xorg/server/drivers/Makefile:1.102 Thu May 27 04:54:21 2021
+++ src/external/mit/xorg/server/drivers/Makefile Sat Aug 28 08:56:10 2021
@@ -1,14 +1,7 @@
-# $NetBSD: Makefile,v 1.102 2021/05/27 04:54:21 jdc Exp $
+# $NetBSD: Makefile,v 1.103 2021/08/28 08:56:10 maya Exp $
.include
-# modesetting is builtin to xorg-server 1.18 tree
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-MODE_SETTING= xf86-video-modesetting
-.else
-MODE_SETTING=
-.endif
-
# xf86-input drivers
SUBDIR= \
@@ -44,7 +37,6 @@ SUBDIR+= \
xf86-video-intel \
xf86-video-mach64 \
xf86-video-mga \
- ${MODE_SETTING} \
xf86-video-neomagic \
xf86-video-nv \
xf86-video-nouveau \
@@ -181,7 +173,6 @@ SUBDIR+= \
.if ${MACHINE} == "evbarm"
SUBDIR+= \
xf86-video-ati \
- ${MODE_SETTING} \
xf86-video-nouveau \
xf86-video-radeon \
xf86-video-radeon-kms \
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: maya
Date: Sat Aug 28 08:56:10 UTC 2021
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Removed Files:
src/external/mit/xorg/server/drivers/xf86-video-modesetting: Makefile
Log Message:
Remove unused xf86-video-modesetting.
In newer xorg-server, it is integrated into the server
No users of old xorg-server use modesetting.
It requires drm drivers, but also, the sole possible user of old
xorg-server that could be handled by this Makefile is netwinder,
but it has a different ${MACHINE} and so seems like it never built the
driver.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: maya
Date: Wed Aug 11 23:02:39 UTC 2021
Modified Files:
src/external/mit/xorg/server/xorg-server/glamor: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
Log Message:
Fix glamor - don't use stub functions
${LDADD.gbm} seems to be empty - use -lgbm directly (couldn't find a better
fix)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/glamor/Makefile
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/glamor/Makefile
diff -u src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.3 src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.3 Fri Sep 2 03:58:59 2016
+++ src/external/mit/xorg/server/xorg-server/glamor/Makefile Wed Aug 11 23:02:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/09/02 03:58:59 jakllsch Exp $
+# $NetBSD: Makefile,v 1.4 2021/08/11 23:02:39 maya Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -42,13 +42,19 @@ SRCS= \
glamor_sync.c
SRCS+= \
glamor_xv.c
+.if ${HAVE_XORG_GLAMOR} == "no"
SRCS+= \
glamor_egl_stubs.c
-SRCS.EGL= \
- glamor_egl.c
+.else
+SRCS+= \
+ glamor_egl.c \
+ glamor_eglmodule.c
+.endif
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
+ -I${DESTDIR}${X11INCDIR}/libdrm \
+ -I${X11SRCDIR.xorg-server}/glamor \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.18 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.19
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.18 Sun Sep 13 23:01:02 2020
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Wed Aug 11 23:02:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/09/13 23:01:02 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2021/08/11 23:02:39 maya Exp $
.include
@@ -33,7 +33,7 @@ LDADD+= ${LDADD.dix}
LDADD+= ${LDADD.config}
LDADD+= ${LDADD.dbe}
.if ${HAVE_XORG_GLAMOR} != "no"
-LDADD+= ${LDADD.glamor} ${LDADD.gbm}
+LDADD+= ${LDADD.glamor} -lgbm
.endif
LDADD+= ${LDADD.record}
LDADD+= ${LDADD.hw/xfree86/loader}
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: maya
Date: Wed Aug 11 23:02:39 UTC 2021
Modified Files:
src/external/mit/xorg/server/xorg-server/glamor: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
Log Message:
Fix glamor - don't use stub functions
${LDADD.gbm} seems to be empty - use -lgbm directly (couldn't find a better
fix)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/glamor/Makefile
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: maya Date: Sat May 29 13:08:08 UTC 2021 Modified Files: src: README.md Log Message: use libera.chat-hosted kiwiirc To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/README.md Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/README.md diff -u src/README.md:1.7 src/README.md:1.8 --- src/README.md:1.7 Wed May 26 22:26:16 2021 +++ src/README.md Sat May 29 13:08:08 2021 @@ -35,7 +35,7 @@ Troubleshooting - Send bugs and patches [via web form](https://www.NetBSD.org/cgi-bin/sendpr.cgi?gndb=netbsd). - Subscribe to the [mailing lists](https://www.NetBSD.org/mailinglists/). The [netbsd-users](https://www.NetBSD.org/mailinglists/#netbsd-users) list is a good choice for many problems; watch [current-users](https://www.NetBSD.org/mailinglists/#current-users) if you follow the bleeding edge of NetBSD-current. -- Join the community IRC channel [#netbsd @ libera.chat](https://kiwiirc.com/nextclient/irc.libera.chat/netbsd). +- Join the community IRC channel [#netbsd @ libera.chat](https://web.libera.chat/#netbsd). Latest sources --
CVS commit: src
Module Name:src Committed By: maya Date: Sat May 29 13:08:08 UTC 2021 Modified Files: src: README.md Log Message: use libera.chat-hosted kiwiirc To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/README.md Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: maya Date: Wed May 26 22:26:16 UTC 2021 Modified Files: src: README.md Log Message: suggest libera.chat instead To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/README.md Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/README.md diff -u src/README.md:1.6 src/README.md:1.7 --- src/README.md:1.6 Wed Mar 17 15:26:20 2021 +++ src/README.md Wed May 26 22:26:16 2021 @@ -35,7 +35,7 @@ Troubleshooting - Send bugs and patches [via web form](https://www.NetBSD.org/cgi-bin/sendpr.cgi?gndb=netbsd). - Subscribe to the [mailing lists](https://www.NetBSD.org/mailinglists/). The [netbsd-users](https://www.NetBSD.org/mailinglists/#netbsd-users) list is a good choice for many problems; watch [current-users](https://www.NetBSD.org/mailinglists/#current-users) if you follow the bleeding edge of NetBSD-current. -- Join the community IRC channel [#netbsd @ freenode](https://webchat.freenode.net/?channels=#netbsd). +- Join the community IRC channel [#netbsd @ libera.chat](https://kiwiirc.com/nextclient/irc.libera.chat/netbsd). Latest sources --
CVS commit: src
Module Name:src Committed By: maya Date: Wed May 26 22:26:16 UTC 2021 Modified Files: src: README.md Log Message: suggest libera.chat instead To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/README.md Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/cgdconfig
Module Name:src Committed By: maya Date: Sun Apr 18 19:56:10 UTC 2021 Modified Files: src/sbin/cgdconfig: cgdconfig.8 cgdconfig.c Log Message: The -n flag is useless with -g, don't mention it. >From rudolf in PR misc/36243 To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sbin/cgdconfig/cgdconfig.8 cvs rdiff -u -r1.50 -r1.51 src/sbin/cgdconfig/cgdconfig.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/cgdconfig
Module Name:src
Committed By: maya
Date: Sun Apr 18 19:56:10 UTC 2021
Modified Files:
src/sbin/cgdconfig: cgdconfig.8 cgdconfig.c
Log Message:
The -n flag is useless with -g, don't mention it.
>From rudolf in PR misc/36243
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sbin/cgdconfig/cgdconfig.8
cvs rdiff -u -r1.50 -r1.51 src/sbin/cgdconfig/cgdconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/cgdconfig/cgdconfig.8
diff -u src/sbin/cgdconfig/cgdconfig.8:1.48 src/sbin/cgdconfig/cgdconfig.8:1.49
--- src/sbin/cgdconfig/cgdconfig.8:1.48 Fri Dec 11 21:52:19 2020
+++ src/sbin/cgdconfig/cgdconfig.8 Sun Apr 18 19:56:09 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: cgdconfig.8,v 1.48 2020/12/11 21:52:19 riastradh Exp $
+.\" $NetBSD: cgdconfig.8,v 1.49 2021/04/18 19:56:09 maya Exp $
.\"
.\" Copyright (c) 2002, The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd December 11, 2020
+.Dd April 18, 2021
.Dt CGDCONFIG 8
.Os
.Sh NAME
@@ -52,7 +52,8 @@
.Ar paramsfile
.Nm
.Fl g
-.Op Fl nv
+.Op Fl v
+.Op Fl V Ar vmeth
.Op Fl i Ar ivmeth
.Op Fl k Ar kgmeth
.Op Fl o Ar outfile
Index: src/sbin/cgdconfig/cgdconfig.c
diff -u src/sbin/cgdconfig/cgdconfig.c:1.50 src/sbin/cgdconfig/cgdconfig.c:1.51
--- src/sbin/cgdconfig/cgdconfig.c:1.50 Wed Apr 10 06:11:37 2019
+++ src/sbin/cgdconfig/cgdconfig.c Sun Apr 18 19:56:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdconfig.c,v 1.50 2019/04/10 06:11:37 kre Exp $ */
+/* $NetBSD: cgdconfig.c,v 1.51 2021/04/18 19:56:09 maya Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 2002, 2003\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: cgdconfig.c,v 1.50 2019/04/10 06:11:37 kre Exp $");
+__RCSID("$NetBSD: cgdconfig.c,v 1.51 2021/04/18 19:56:09 maya Exp $");
#endif
#include
@@ -144,7 +144,7 @@ usage(void)
getprogname());
(void)fprintf(stderr, " %s -G [-enpv] [-i ivmeth] [-k kgmeth] "
"[-o outfile] paramsfile\n", getprogname());
- (void)fprintf(stderr, " %s -g [-nv] [-i ivmeth] [-k kgmeth] "
+ (void)fprintf(stderr, " %s -g [-v] [-i ivmeth] [-k kgmeth] "
"[-o outfile] alg [keylen]\n", getprogname());
(void)fprintf(stderr, " %s -l [-v[v]] [cgd]\n", getprogname());
(void)fprintf(stderr, " %s -s [-nv] [-i ivmeth] cgd dev alg "
CVS commit: src/bin/ps
Module Name:src
Committed By: maya
Date: Sat Apr 17 08:35:33 UTC 2021
Modified Files:
src/bin/ps: print.c
Log Message:
Remove SCCS workaround. No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/bin/ps/print.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ps/print.c
diff -u src/bin/ps/print.c:1.134 src/bin/ps/print.c:1.135
--- src/bin/ps/print.c:1.134 Tue Apr 6 13:35:52 2021
+++ src/bin/ps/print.c Sat Apr 17 08:35:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.134 2021/04/06 13:35:52 christos Exp $ */
+/* $NetBSD: print.c,v 1.135 2021/04/17 08:35:33 maya Exp $ */
/*
* Copyright (c) 2000, 2007 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94";
#else
-__RCSID("$NetBSD: print.c,v 1.134 2021/04/06 13:35:52 christos Exp $");
+__RCSID("$NetBSD: print.c,v 1.135 2021/04/17 08:35:33 maya Exp $");
#endif
#endif /* not lint */
@@ -800,11 +800,9 @@ started(struct pinfo *pi, VARENT *ve, en
if (now == 0)
(void)time();
if (now - k->p_ustart_sec < SECSPERDAY)
- /* I *hate* SCCS... */
- safe_strftime(buf, sizeof(buf) - 1, "%l:%" "M%p", tp);
+ safe_strftime(buf, sizeof(buf) - 1, "%l:%M%p", tp);
else if (now - k->p_ustart_sec < DAYSPERWEEK * SECSPERDAY)
- /* I *hate* SCCS... */
- safe_strftime(buf, sizeof(buf) - 1, "%a%" "I%p", tp);
+ safe_strftime(buf, sizeof(buf) - 1, "%a%I%p", tp);
else
safe_strftime(buf, sizeof(buf) - 1, "%e%b%y", tp);
/* %e and %l can start with a space. */
CVS commit: src/bin/ps
Module Name:src Committed By: maya Date: Sat Apr 17 08:35:33 UTC 2021 Modified Files: src/bin/ps: print.c Log Message: Remove SCCS workaround. No binary change. To generate a diff of this commit: cvs rdiff -u -r1.134 -r1.135 src/bin/ps/print.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/systat
Module Name:src
Committed By: maya
Date: Sat Apr 17 08:34:28 UTC 2021
Modified Files:
src/usr.bin/systat: ps.c
Log Message:
Remove SCCS workarounds. No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/systat/ps.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/systat/ps.c
diff -u src/usr.bin/systat/ps.c:1.39 src/usr.bin/systat/ps.c:1.40
--- src/usr.bin/systat/ps.c:1.39 Wed Aug 26 10:56:01 2020
+++ src/usr.bin/systat/ps.c Sat Apr 17 08:34:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ps.c,v 1.39 2020/08/26 10:56:01 simonb Exp $ */
+/* $NetBSD: ps.c,v 1.40 2021/04/17 08:34:27 maya Exp $ */
/*-
* Copyright (c) 1999
@@ -45,7 +45,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: ps.c,v 1.39 2020/08/26 10:56:01 simonb Exp $");
+__RCSID("$NetBSD: ps.c,v 1.40 2021/04/17 08:34:27 maya Exp $");
#endif /* not lint */
#include
@@ -340,11 +340,9 @@ start2str(struct kinfo_proc2 *kp)
if (now == 0)
time();
if (now - u_start.tv_sec < 24 * SECSPERHOUR) {
- /* I *hate* SCCS... */
- strftime(startstr, sizeof(startstr) - 1, "%l:%" "M%p", tp);
+ strftime(startstr, sizeof(startstr) - 1, "%l:%M%p", tp);
} else if (now - u_start.tv_sec < 7 * SECSPERDAY) {
- /* I *hate* SCCS... */
- strftime(startstr, sizeof(startstr) - 1, "%a%" "I%p", tp);
+ strftime(startstr, sizeof(startstr) - 1, "%a%I%p", tp);
} else
strftime(startstr, sizeof(startstr) - 1, "%e%b%y", tp);
CVS commit: src/usr.bin/systat
Module Name:src Committed By: maya Date: Sat Apr 17 08:34:28 UTC 2021 Modified Files: src/usr.bin/systat: ps.c Log Message: Remove SCCS workarounds. No binary change. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/usr.bin/systat/ps.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/w
Module Name:src
Committed By: maya
Date: Sat Apr 17 06:14:15 UTC 2021
Modified Files:
src/usr.bin/w: pr_time.c w.c
Log Message:
Remove SCCS workarounds. No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/w/pr_time.c
cvs rdiff -u -r1.90 -r1.91 src/usr.bin/w/w.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/w/pr_time.c
diff -u src/usr.bin/w/pr_time.c:1.18 src/usr.bin/w/pr_time.c:1.19
--- src/usr.bin/w/pr_time.c:1.18 Wed Aug 17 13:48:11 2011
+++ src/usr.bin/w/pr_time.c Sat Apr 17 06:14:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pr_time.c,v 1.18 2011/08/17 13:48:11 christos Exp $ */
+/* $NetBSD: pr_time.c,v 1.19 2021/04/17 06:14:15 maya Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pr_time.c 8.2 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: pr_time.c,v 1.18 2011/08/17 13:48:11 christos Exp $");
+__RCSID("$NetBSD: pr_time.c,v 1.19 2021/04/17 06:14:15 maya Exp $");
#endif
#endif /* not lint */
@@ -51,9 +51,6 @@ __RCSID("$NetBSD: pr_time.c,v 1.18 2011/
/*
* pr_attime --
* Print the time since the user logged in.
- *
- * Note: SCCS forces the bizarre string manipulation, things like
- * %I% get replaced in the source code.
*/
void
pr_attime(time_t *started, time_t *now)
@@ -71,11 +68,11 @@ pr_attime(time_t *started, time_t *now)
/* If more than a week, use day-month-year. */
(void)strftime(buf, sizeof(buf), "%d%b%y", tp);
} else if (tp->tm_yday != tnow_yday) {
- /* If not today, use day-hour-am/pm. Damn SCCS */
- (void)strftime(buf, sizeof(buf), "%a%" "I%p", tp);
+ /* If not today, use day-hour-am/pm. */
+ (void)strftime(buf, sizeof(buf), "%a%I%p", tp);
} else {
- /* Default is hh:mm{am,pm}. Damn SCCS */
- (void)strftime(buf, sizeof(buf), "%l:%" "M%p", tp);
+ /* Default is hh:mm{am,pm}. */
+ (void)strftime(buf, sizeof(buf), "%l:%M%p", tp);
}
buf[sizeof(buf) - 1] = '\0';
Index: src/usr.bin/w/w.c
diff -u src/usr.bin/w/w.c:1.90 src/usr.bin/w/w.c:1.91
--- src/usr.bin/w/w.c:1.90 Sat Aug 1 17:53:38 2020
+++ src/usr.bin/w/w.c Sat Apr 17 06:14:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: w.c,v 1.90 2020/08/01 17:53:38 kim Exp $ */
+/* $NetBSD: w.c,v 1.91 2021/04/17 06:14:15 maya Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)w.c 8.6 (Berkeley) 6/30/94";
#else
-__RCSID("$NetBSD: w.c,v 1.90 2020/08/01 17:53:38 kim Exp $");
+__RCSID("$NetBSD: w.c,v 1.91 2021/04/17 06:14:15 maya Exp $");
#endif
#endif /* not lint */
@@ -465,11 +465,8 @@ pr_header(time_t *nowp, int nusers)
/*
* Print time of day.
- *
- * SCCS forces the string manipulation below, as it replaces
- * %, M, and % in a character string with the file name.
*/
- (void)strftime(buf, sizeof(buf), "%l:%" "M%p", localtime(nowp));
+ (void)strftime(buf, sizeof(buf), "%l:%M%p", localtime(nowp));
buf[sizeof(buf) - 1] = '\0';
(void)printf("%s ", buf);
CVS commit: src/usr.bin/w
Module Name:src Committed By: maya Date: Sat Apr 17 06:14:15 UTC 2021 Modified Files: src/usr.bin/w: pr_time.c w.c Log Message: Remove SCCS workarounds. No binary change. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/usr.bin/w/pr_time.c cvs rdiff -u -r1.90 -r1.91 src/usr.bin/w/w.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: maya Date: Fri Dec 25 09:02:41 UTC 2020 Modified Files: src/usr.bin/calendar/calendars: calendar.judaic Log Message: Update to 2021, hopefully less errors made in this year. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.bin/calendar/calendars/calendar.judaic Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.judaic diff -u src/usr.bin/calendar/calendars/calendar.judaic:1.9 src/usr.bin/calendar/calendars/calendar.judaic:1.10 --- src/usr.bin/calendar/calendars/calendar.judaic:1.9 Fri Dec 20 22:58:53 2019 +++ src/usr.bin/calendar/calendars/calendar.judaic Fri Dec 25 09:02:41 2020 @@ -1,29 +1,29 @@ -01/21* Tu B'Shvat (Feast of Trees) -03/09* Fast of Esther (Battle of Purim; 1 day before Purim; fast day) -03/10* Purim (Feast of Lots; 30 days before Pesach) -04/09* Pesach (First Day of Passover; sabbatical) -04/10* Pesach (sabbatical) -04/11* Pesach (sabbatical) -04/16* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) -04/17* Mimouna (Morrocan Jewish Celebration of End of Pesach) -04/09* Yom HaAtzma'ut (Israel Independence Day) -05/12* Lag B'Omer (Commemoration of the Great Rebellion) -05/22* Yom Yerushalayim (Reunification of Jerusalem) -05/29* Shavuot (Festival of Weeks; 50 days after Pesach; sabbatical) -07/09* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem; +01/28* Tu B'Shvat (Feast of Trees) +02/25* Fast of Esther (Battle of Purim; 1 day before Purim; fast day) +02/26* Purim (Feast of Lots; 30 days before Pesach) +03/29* Pesach (First Day of Passover; sabbatical) +03/30* Pesach (sabbatical) +03/31* Pesach (sabbatical) +04/04* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) +04/05* Mimouna (Morrocan Jewish Celebration of End of Pesach) +04/15* Yom HaAtzma'ut (Israel Independence Day) +04/30* Lag B'Omer (Commemoration of the Great Rebellion) +05/10* Yom Yerushalayim (Reunification of Jerusalem) +05/17* Shavuot (Festival of Weeks; 50 days after Pesach; sabbatical) +06/27* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem; fast day) -07/30* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day) -09/19* First Day of Rosh Hashanah (Jewish Lunar New Year; 5781 == 2021; +07/18* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day) +09/07* First Day of Rosh Hashanah (Jewish Lunar New Year; 5782 == 2022; sabbatical) -09/20* Rosh Hashanah (sabbatical) -09/21* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day +09/08* Rosh Hashanah (sabbatical) +09/09* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day after Rosh Hashanah; fast day) -09/28* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah; +09/16* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah; sabbatical, fast day) -10/03* Sukkot (Festival of Tabernacles; 14 days after Rosh Hashanah; +09/21* Sukkot (Festival of Tabernacles; 14 days after Rosh Hashanah; sabbatical) -10/09* Hoshanah Rabba (7th day of Sukkot) -10/01* Shmini Atzeret (8th Day of Gathering; 1 day after Sukkot; sabbatical) -11/16* Sigd (Beta Israel; 50 days after Yom Kippur) -12/10* First Day of Chanukah -12/25* Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day) +09/27* Hoshanah Rabba (7th day of Sukkot) +09/28* Shmini Atzeret (8th Day of Gathering; 1 day after Sukkot; sabbatical) +11/04* Sigd (Beta Israel; 50 days after Yom Kippur) +11/28* First Day of Chanukah +12/14* Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day)
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: maya Date: Fri Dec 25 09:02:41 UTC 2020 Modified Files: src/usr.bin/calendar/calendars: calendar.judaic Log Message: Update to 2021, hopefully less errors made in this year. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.bin/calendar/calendars/calendar.judaic Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: maya Date: Fri Dec 18 20:07:40 UTC 2020 Removed Files: src/external/bsd/pkg_install/dist: Makefile.in README config.guess config.sub configure configure.ac diff install-sh tkpkg src/external/bsd/pkg_install/dist/add: Makefile.in pkg_add.cat src/external/bsd/pkg_install/dist/admin: Makefile.in audit-packages.cat download-vulnerability-list.cat pkg_admin.cat src/external/bsd/pkg_install/dist/create: Makefile.in pkg_create.cat src/external/bsd/pkg_install/dist/delete: Makefile.in pkg_delete.cat src/external/bsd/pkg_install/dist/info: Makefile.in pkg_info.cat src/external/bsd/pkg_install/dist/lib: Makefile.in pkg_install.conf.cat.in pkg_summary.cat pkgsrc.cat Log Message: Merge pkg_install-20201218 To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/Makefile.in \ src/external/bsd/pkg_install/dist/README \ src/external/bsd/pkg_install/dist/config.guess \ src/external/bsd/pkg_install/dist/config.sub \ src/external/bsd/pkg_install/dist/configure \ src/external/bsd/pkg_install/dist/configure.ac \ src/external/bsd/pkg_install/dist/install-sh \ src/external/bsd/pkg_install/dist/tkpkg cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/diff cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/add/Makefile.in cvs rdiff -u -r1.4 -r0 src/external/bsd/pkg_install/dist/add/pkg_add.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/admin/Makefile.in \ src/external/bsd/pkg_install/dist/admin/audit-packages.cat \ src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.cat cvs rdiff -u -r1.5 -r0 src/external/bsd/pkg_install/dist/admin/pkg_admin.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/create/Makefile.in cvs rdiff -u -r1.4 -r0 \ src/external/bsd/pkg_install/dist/create/pkg_create.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/delete/Makefile.in cvs rdiff -u -r1.4 -r0 \ src/external/bsd/pkg_install/dist/delete/pkg_delete.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/info/Makefile.in cvs rdiff -u -r1.4 -r0 src/external/bsd/pkg_install/dist/info/pkg_info.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/lib/Makefile.in cvs rdiff -u -r1.4 -r0 \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in \ src/external/bsd/pkg_install/dist/lib/pkg_summary.cat \ src/external/bsd/pkg_install/dist/lib/pkgsrc.cat Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: maya Date: Fri Dec 18 20:07:40 UTC 2020 Removed Files: src/external/bsd/pkg_install/dist: Makefile.in README config.guess config.sub configure configure.ac diff install-sh tkpkg src/external/bsd/pkg_install/dist/add: Makefile.in pkg_add.cat src/external/bsd/pkg_install/dist/admin: Makefile.in audit-packages.cat download-vulnerability-list.cat pkg_admin.cat src/external/bsd/pkg_install/dist/create: Makefile.in pkg_create.cat src/external/bsd/pkg_install/dist/delete: Makefile.in pkg_delete.cat src/external/bsd/pkg_install/dist/info: Makefile.in pkg_info.cat src/external/bsd/pkg_install/dist/lib: Makefile.in pkg_install.conf.cat.in pkg_summary.cat pkgsrc.cat Log Message: Merge pkg_install-20201218 To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/Makefile.in \ src/external/bsd/pkg_install/dist/README \ src/external/bsd/pkg_install/dist/config.guess \ src/external/bsd/pkg_install/dist/config.sub \ src/external/bsd/pkg_install/dist/configure \ src/external/bsd/pkg_install/dist/configure.ac \ src/external/bsd/pkg_install/dist/install-sh \ src/external/bsd/pkg_install/dist/tkpkg cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/diff cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/add/Makefile.in cvs rdiff -u -r1.4 -r0 src/external/bsd/pkg_install/dist/add/pkg_add.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/admin/Makefile.in \ src/external/bsd/pkg_install/dist/admin/audit-packages.cat \ src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.cat cvs rdiff -u -r1.5 -r0 src/external/bsd/pkg_install/dist/admin/pkg_admin.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/create/Makefile.in cvs rdiff -u -r1.4 -r0 \ src/external/bsd/pkg_install/dist/create/pkg_create.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/delete/Makefile.in cvs rdiff -u -r1.4 -r0 \ src/external/bsd/pkg_install/dist/delete/pkg_delete.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/info/Makefile.in cvs rdiff -u -r1.4 -r0 src/external/bsd/pkg_install/dist/info/pkg_info.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/lib/Makefile.in cvs rdiff -u -r1.4 -r0 \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in \ src/external/bsd/pkg_install/dist/lib/pkg_summary.cat \ src/external/bsd/pkg_install/dist/lib/pkgsrc.cat Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/pkg_install/dist
Module Name:src Committed By: maya Date: Fri Dec 18 19:41:45 UTC 2020 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6964 Log Message: Import pkg_install-20201218 This time with the right style tag, and not adding unnecessary files (same as previous imports). Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20201218 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.8 U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt No conflicts created by this import
CVS import: src/external/bsd/pkg_install/dist
Module Name:src Committed By: maya Date: Fri Dec 18 19:41:45 UTC 2020 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6964 Log Message: Import pkg_install-20201218 This time with the right style tag, and not adding unnecessary files (same as previous imports). Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20201218 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.8 U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt No conflicts created by this import
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: maya Date: Fri Dec 18 17:32:42 UTC 2020 Modified Files: src/external/bsd/pkg_install/dist/lib: pkgdb.c plist.c version.h Added Files: src/external/bsd/pkg_install/dist: Makefile.in README config.guess config.sub configure configure.ac install-sh tkpkg src/external/bsd/pkg_install/dist/add: Makefile.in pkg_add.cat src/external/bsd/pkg_install/dist/admin: Makefile.in audit-packages.cat download-vulnerability-list.cat pkg_admin.cat src/external/bsd/pkg_install/dist/create: Makefile.in pkg_create.cat src/external/bsd/pkg_install/dist/delete: Makefile.in pkg_delete.cat src/external/bsd/pkg_install/dist/info: Makefile.in pkg_info.cat src/external/bsd/pkg_install/dist/lib: Makefile.in pkg_install.conf.cat.in pkg_summary.cat pkgsrc.cat Log Message: Merge pkg-install-20201218 To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 src/external/bsd/pkg_install/dist/Makefile.in \ src/external/bsd/pkg_install/dist/README \ src/external/bsd/pkg_install/dist/config.guess \ src/external/bsd/pkg_install/dist/config.sub \ src/external/bsd/pkg_install/dist/configure \ src/external/bsd/pkg_install/dist/configure.ac \ src/external/bsd/pkg_install/dist/install-sh \ src/external/bsd/pkg_install/dist/tkpkg cvs rdiff -u -r0 -r1.3 src/external/bsd/pkg_install/dist/add/Makefile.in cvs rdiff -u -r0 -r1.4 src/external/bsd/pkg_install/dist/add/pkg_add.cat cvs rdiff -u -r0 -r1.3 src/external/bsd/pkg_install/dist/admin/Makefile.in \ src/external/bsd/pkg_install/dist/admin/audit-packages.cat \ src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.cat cvs rdiff -u -r0 -r1.5 src/external/bsd/pkg_install/dist/admin/pkg_admin.cat cvs rdiff -u -r0 -r1.3 src/external/bsd/pkg_install/dist/create/Makefile.in cvs rdiff -u -r0 -r1.4 \ src/external/bsd/pkg_install/dist/create/pkg_create.cat cvs rdiff -u -r0 -r1.3 src/external/bsd/pkg_install/dist/delete/Makefile.in cvs rdiff -u -r0 -r1.4 \ src/external/bsd/pkg_install/dist/delete/pkg_delete.cat cvs rdiff -u -r0 -r1.3 src/external/bsd/pkg_install/dist/info/Makefile.in cvs rdiff -u -r0 -r1.4 src/external/bsd/pkg_install/dist/info/pkg_info.cat cvs rdiff -u -r0 -r1.3 src/external/bsd/pkg_install/dist/lib/Makefile.in cvs rdiff -u -r0 -r1.4 \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in \ src/external/bsd/pkg_install/dist/lib/pkg_summary.cat \ src/external/bsd/pkg_install/dist/lib/pkgsrc.cat cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/lib/pkgdb.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pkg_install/dist/lib/plist.c cvs rdiff -u -r1.18 -r1.19 src/external/bsd/pkg_install/dist/lib/version.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/pkg_install/dist
Module Name:src Committed By: maya Date: Fri Dec 18 17:19:17 UTC 2020 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8075 Log Message: import pkg_install version 20201218 from pkgsrc - Support continuing to install to /var/db/pkg if it exists and the new pkgdb doesn't. In the future, we can warn about this once we have tested advice that we can give to users who want to move the location of pkgdb. - Don't do anything about /var/db/pkg on non-NetBSD-base. This creates conflicts with other package managers that also install to /var/db/pkg. Status: Vendor Tag: PKGSRC Release Tags: pkg-install-20201218 U src/external/bsd/pkg_install/dist/Makefile.in U src/external/bsd/pkg_install/dist/README U src/external/bsd/pkg_install/dist/config.guess U src/external/bsd/pkg_install/dist/config.sub C src/external/bsd/pkg_install/dist/configure C src/external/bsd/pkg_install/dist/configure.ac U src/external/bsd/pkg_install/dist/install-sh U src/external/bsd/pkg_install/dist/tkpkg N src/external/bsd/pkg_install/dist/diff C src/external/bsd/pkg_install/dist/add/Makefile.in U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 C src/external/bsd/pkg_install/dist/add/pkg_add.cat U src/external/bsd/pkg_install/dist/admin/Makefile.in U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.8 U src/external/bsd/pkg_install/dist/admin/audit-packages.cat U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.cat U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 C src/external/bsd/pkg_install/dist/admin/pkg_admin.cat C src/external/bsd/pkg_install/dist/create/Makefile.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 C src/external/bsd/pkg_install/dist/create/pkg_create.cat U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/Makefile.in U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c C src/external/bsd/pkg_install/dist/delete/pkg_delete.cat U src/external/bsd/pkg_install/dist/info/Makefile.in U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 C src/external/bsd/pkg_install/dist/info/pkg_info.cat U src/external/bsd/pkg_install/dist/info/show.c C src/external/bsd/pkg_install/dist/lib/Makefile.in U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in C src/external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 C src/external/bsd/pkg_install/dist/lib/pkg_summary.cat C src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 C src/external/bsd/pkg_install/dist/lib/pkgsrc.cat C src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c C src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist
CVS import: src/external/bsd/pkg_install/dist
Module Name:src Committed By: maya Date: Fri Dec 18 17:19:17 UTC 2020 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8075 Log Message: import pkg_install version 20201218 from pkgsrc - Support continuing to install to /var/db/pkg if it exists and the new pkgdb doesn't. In the future, we can warn about this once we have tested advice that we can give to users who want to move the location of pkgdb. - Don't do anything about /var/db/pkg on non-NetBSD-base. This creates conflicts with other package managers that also install to /var/db/pkg. Status: Vendor Tag: PKGSRC Release Tags: pkg-install-20201218 U src/external/bsd/pkg_install/dist/Makefile.in U src/external/bsd/pkg_install/dist/README U src/external/bsd/pkg_install/dist/config.guess U src/external/bsd/pkg_install/dist/config.sub C src/external/bsd/pkg_install/dist/configure C src/external/bsd/pkg_install/dist/configure.ac U src/external/bsd/pkg_install/dist/install-sh U src/external/bsd/pkg_install/dist/tkpkg N src/external/bsd/pkg_install/dist/diff C src/external/bsd/pkg_install/dist/add/Makefile.in U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 C src/external/bsd/pkg_install/dist/add/pkg_add.cat U src/external/bsd/pkg_install/dist/admin/Makefile.in U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.8 U src/external/bsd/pkg_install/dist/admin/audit-packages.cat U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.cat U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 C src/external/bsd/pkg_install/dist/admin/pkg_admin.cat C src/external/bsd/pkg_install/dist/create/Makefile.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 C src/external/bsd/pkg_install/dist/create/pkg_create.cat U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/Makefile.in U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c C src/external/bsd/pkg_install/dist/delete/pkg_delete.cat U src/external/bsd/pkg_install/dist/info/Makefile.in U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 C src/external/bsd/pkg_install/dist/info/pkg_info.cat U src/external/bsd/pkg_install/dist/info/show.c C src/external/bsd/pkg_install/dist/lib/Makefile.in U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in C src/external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 C src/external/bsd/pkg_install/dist/lib/pkg_summary.cat C src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 C src/external/bsd/pkg_install/dist/lib/pkgsrc.cat C src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c C src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist
Re: CVS commit: [netbsd-8] src/external/bsd/pkg_install
On Tue, Dec 08, 2020 at 06:48:59PM +, Martin Husemann wrote: > Module Name: src > Committed By: martin > Date: Tue Dec 8 18:48:59 UTC 2020 > > Modified Files: > src/external/bsd/pkg_install [netbsd-8]: Makefile.inc > src/external/bsd/pkg_install/dist/add [netbsd-8]: perform.c > src/external/bsd/pkg_install/dist/admin [netbsd-8]: check.c main.c > pkg_admin.1 > src/external/bsd/pkg_install/dist/create [netbsd-8]: perform.c pl.c > src/external/bsd/pkg_install/dist/info [netbsd-8]: perform.c > src/external/bsd/pkg_install/dist/lib [netbsd-8]: iterate.c lib.h > license.c pkgdb.c plist.c version.h vulnerabilities-file.c > src/external/bsd/pkg_install/lib [netbsd-8]: Makefile config.h > > Log Message: > Sync external/bsd/pkg_install with -current, requested by wiz in ticket #1626: This change was poorly done and having it pulled up to stable is even worse.
CVS commit: src/share/misc
Module Name:src Committed By: maya Date: Tue Nov 17 19:56:42 UTC 2020 Modified Files: src/share/misc: acronyms.comp Log Message: Add "AOT" Ahead Of Time To generate a diff of this commit: cvs rdiff -u -r1.315 -r1.316 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.315 src/share/misc/acronyms.comp:1.316 --- src/share/misc/acronyms.comp:1.315 Thu Nov 5 18:05:06 2020 +++ src/share/misc/acronyms.comp Tue Nov 17 19:56:42 2020 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.315 2020/11/05 18:05:06 dholland Exp $ +$NetBSD: acronyms.comp,v 1.316 2020/11/17 19:56:42 maya Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -62,6 +62,7 @@ AO analog output AOC add-on card AOL Alert-on-LAN AOS add or subtract +AOT ahead of time AP access point AP application processor APFS Apple file system
CVS commit: src/share/misc
Module Name:src Committed By: maya Date: Tue Nov 17 19:56:42 UTC 2020 Modified Files: src/share/misc: acronyms.comp Log Message: Add "AOT" Ahead Of Time To generate a diff of this commit: cvs rdiff -u -r1.315 -r1.316 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/ofl
Module Name:src
Committed By: maya
Date: Fri Nov 13 09:56:53 UTC 2020
Modified Files:
src/external/ofl: Makefile
Log Message:
Needs bsd.own.mk for MKX11.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/ofl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ofl/Makefile
diff -u src/external/ofl/Makefile:1.2 src/external/ofl/Makefile:1.3
--- src/external/ofl/Makefile:1.2 Fri Nov 13 08:33:07 2020
+++ src/external/ofl/Makefile Fri Nov 13 09:56:53 2020
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2020/11/13 08:33:07 maya Exp $
+# $NetBSD: Makefile,v 1.3 2020/11/13 09:56:53 maya Exp $
+
+.include
.if ${MKX11} != "no"
SUBDIR+= font-liberation-ttf
CVS commit: src/external/ofl
Module Name:src Committed By: maya Date: Fri Nov 13 09:56:53 UTC 2020 Modified Files: src/external/ofl: Makefile Log Message: Needs bsd.own.mk for MKX11. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/ofl/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/ofl
Module Name:src
Committed By: maya
Date: Fri Nov 13 08:33:07 UTC 2020
Modified Files:
src/external/ofl: Makefile
Log Message:
add rcsid, make font conditional on MKX11.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/ofl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ofl/Makefile
diff -u src/external/ofl/Makefile:1.1 src/external/ofl/Makefile:1.2
--- src/external/ofl/Makefile:1.1 Thu Nov 12 22:28:02 2020
+++ src/external/ofl/Makefile Fri Nov 13 08:33:07 2020
@@ -1,3 +1,7 @@
+# $NetBSD: Makefile,v 1.2 2020/11/13 08:33:07 maya Exp $
+
+.if ${MKX11} != "no"
SUBDIR+= font-liberation-ttf
+.endif
.include
CVS commit: src/external/ofl
Module Name:src Committed By: maya Date: Fri Nov 13 08:33:07 UTC 2020 Modified Files: src/external/ofl: Makefile Log Message: add rcsid, make font conditional on MKX11. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/ofl/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: maya
Date: Thu Nov 12 22:28:02 UTC 2020
Modified Files:
src/distrib/sets/lists/xfont: mi
src/external: Makefile
Added Files:
src/external/ofl: Makefile
src/external/ofl/font-liberation-ttf: Makefile
Log Message:
Hook up font-liberation-ttf to the build.
license ok'd by board.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/xfont/mi
cvs rdiff -u -r1.21 -r1.22 src/external/Makefile
cvs rdiff -u -r0 -r1.1 src/external/ofl/Makefile
cvs rdiff -u -r0 -r1.1 src/external/ofl/font-liberation-ttf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xfont/mi
diff -u src/distrib/sets/lists/xfont/mi:1.44 src/distrib/sets/lists/xfont/mi:1.45
--- src/distrib/sets/lists/xfont/mi:1.44 Sun Oct 11 17:49:07 2020
+++ src/distrib/sets/lists/xfont/mi Thu Nov 12 22:28:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.44 2020/10/11 17:49:07 nia Exp $
+# $NetBSD: mi,v 1.45 2020/11/12 22:28:02 maya Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3799,6 +3799,18 @@
./usr/X11R7/lib/X11/fonts/75dpi/timR24-ISO8859-4.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/75dpi/timR24-ISO8859-9.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/75dpi/timR24.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationMono-Bold.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationMono-BoldItalic.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationMono-Italic.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationMono-Regular.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSans-Bold.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSans-BoldItalic.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSans-Italic.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSans-Regular.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSerif-Bold.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSerif-BoldItalic.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSerif-Italic.ttf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSerif-Regular.ttf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/TTF/Vera.ttf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/TTF/VeraBI.ttf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/TTF/VeraBd.ttf xfont share,xorg,x11fonts
Index: src/external/Makefile
diff -u src/external/Makefile:1.21 src/external/Makefile:1.22
--- src/external/Makefile:1.21 Sat Apr 7 22:39:31 2018
+++ src/external/Makefile Thu Nov 12 22:28:02 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2018/04/07 22:39:31 christos Exp $
+# $NetBSD: Makefile,v 1.22 2020/11/12 22:28:02 maya Exp $
SUBDIR+= apache2 atheros broadcom bsd cddl gpl2 gpl3 historical intel-fw-eula
-SUBDIR+= intel-fw-public ibm-public mpl mit nvidia-firmware public-domain
+SUBDIR+= intel-fw-public ibm-public mpl mit nvidia-firmware ofl public-domain
SUBDIR+= realtek
.include
Added files:
Index: src/external/ofl/Makefile
diff -u /dev/null src/external/ofl/Makefile:1.1
--- /dev/null Thu Nov 12 22:28:02 2020
+++ src/external/ofl/Makefile Thu Nov 12 22:28:02 2020
@@ -0,0 +1,3 @@
+SUBDIR+= font-liberation-ttf
+
+.include
Index: src/external/ofl/font-liberation-ttf/Makefile
diff -u /dev/null src/external/ofl/font-liberation-ttf/Makefile:1.1
--- /dev/null Thu Nov 12 22:28:02 2020
+++ src/external/ofl/font-liberation-ttf/Makefile Thu Nov 12 22:28:02 2020
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2020/11/12 22:28:02 maya Exp $
+
+.include
+
+FONTSUBDIR= TTF
+FONTSRCPKG= font-liberation-ttf
+FILESDIR= ${X11FONTDIR}/TTF
+
+.PATH: ${X11SRCDIR}/external/ofl/${FONTSRCPKG}/src \
+ ${X11SRCDIR}/external/ofl/${FONTSRCPKG}/dist
+
+FILES= LiberationMono-Bold.ttf LiberationMono-BoldItalic.ttf \
+ LiberationMono-Italic.ttf LiberationMono-Regular.ttf \
+ LiberationSans-Bold.ttf LiberationSans-BoldItalic.ttf \
+ LiberationSans-Italic.ttf LiberationSans-Regular.ttf \
+ LiberationSerif-Bold.ttf LiberationSerif-BoldItalic.ttf \
+ LiberationSerif-Italic.ttf LiberationSerif-Regular.ttf
+
+.include
+.include
+.include
CVS commit: src
Module Name:src Committed By: maya Date: Thu Nov 12 22:28:02 UTC 2020 Modified Files: src/distrib/sets/lists/xfont: mi src/external: Makefile Added Files: src/external/ofl: Makefile src/external/ofl/font-liberation-ttf: Makefile Log Message: Hook up font-liberation-ttf to the build. license ok'd by board. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/xfont/mi cvs rdiff -u -r1.21 -r1.22 src/external/Makefile cvs rdiff -u -r0 -r1.1 src/external/ofl/Makefile cvs rdiff -u -r0 -r1.1 src/external/ofl/font-liberation-ttf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/ofl/font-liberation-ttf/src
Module Name:xsrc Committed By: maya Date: Thu Nov 12 22:23:48 UTC 2020 Added Files: xsrc/external/ofl/font-liberation-ttf/src: LiberationMono-Bold.ttf LiberationMono-BoldItalic.ttf LiberationMono-Italic.ttf LiberationMono-Regular.ttf LiberationSans-Bold.ttf LiberationSans-BoldItalic.ttf LiberationSans-Italic.ttf LiberationSans-Regular.ttf LiberationSerif-Bold.ttf LiberationSerif-BoldItalic.ttf LiberationSerif-Italic.ttf LiberationSerif-Regular.ttf Log Message: Add the generated TTF files from font-liberation-ttf This was done using the pkgsrc package. The build is simple enough that we can add our own generation target, but duplicating the generation logic will probably make updates annoying. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-Bold.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-BoldItalic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-Italic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-Regular.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-Bold.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-BoldItalic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-Italic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-Regular.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-Bold.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-BoldItalic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-Italic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-Regular.ttf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-Bold.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-BoldItalic.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-Italic.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-Regular.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-Bold.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-BoldItalic.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-Italic.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-Regular.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-Bold.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-BoldItalic.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-Italic.ttf Binary files are different Index: xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-Regular.ttf Binary files are different
CVS commit: xsrc/external/ofl/font-liberation-ttf/src
Module Name:xsrc Committed By: maya Date: Thu Nov 12 22:23:48 UTC 2020 Added Files: xsrc/external/ofl/font-liberation-ttf/src: LiberationMono-Bold.ttf LiberationMono-BoldItalic.ttf LiberationMono-Italic.ttf LiberationMono-Regular.ttf LiberationSans-Bold.ttf LiberationSans-BoldItalic.ttf LiberationSans-Italic.ttf LiberationSans-Regular.ttf LiberationSerif-Bold.ttf LiberationSerif-BoldItalic.ttf LiberationSerif-Italic.ttf LiberationSerif-Regular.ttf Log Message: Add the generated TTF files from font-liberation-ttf This was done using the pkgsrc package. The build is simple enough that we can add our own generation target, but duplicating the generation logic will probably make updates annoying. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-Bold.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-BoldItalic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-Italic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationMono-Regular.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-Bold.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-BoldItalic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-Italic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSans-Regular.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-Bold.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-BoldItalic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-Italic.ttf \ xsrc/external/ofl/font-liberation-ttf/src/LiberationSerif-Regular.ttf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
