mergemaster still having issues
hello - i am still having issues with mergemaster when building/installing current on my end as per this thread: https://lists.freebsd.org/pipermail/freebsd-current/2019-May/073403.html my source contains the fix that I think we committed to address the original issue, are there any other steps required to get things working: *** Creating the temporary root environment in /var/tmp/temproot *** /var/tmp/temproot ready for use *** Creating and populating directory structure in /var/tmp/temproot cp: /usr/home/pete/git/freebsd/etc/master.passwd: No such file or directory *** FATAL ERROR: Cannot copy files to the temproot environment cheers, -pete -- Pete Wright p...@nomadlogic.org @nomadlogicLA ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: mergemaster still having issues
On Fri, May 17, 2019 at 10:46:57AM -0700, Pete Wright wrote: > hello - i am still having issues with mergemaster when > building/installing current on my end as per this thread: > https://lists.freebsd.org/pipermail/freebsd-current/2019-May/073403.html > > my source contains the fix that I think we committed to address the > original issue, are there any other steps required to get things working: > *** Creating the temporary root environment in /var/tmp/temproot > *** /var/tmp/temproot ready for use > *** Creating and populating directory structure in /var/tmp/temproot > > cp: /usr/home/pete/git/freebsd/etc/master.passwd: No such file or directory > > *** FATAL ERROR: Cannot copy files to the temproot environment > > cheers, > -pete Yes: you need to actually install that (new) version of mergemaster before you try to use it. E.g.: pushd usr.bin/mergemaster && make install; popd Then re-start the userland installation (e.g., "mergemaster -p ...") and proceed with the rest of the install as usual. Peace, david -- David H. Wolfskill da...@catwhisker.org One wonders just who benefits from Trump's trade war with China. See http://www.catwhisker.org/~david/publickey.gpg for my public key. signature.asc Description: PGP signature
Re: mergemaster still having issues
On 5/17/19 10:51 AM, David Wolfskill wrote: On Fri, May 17, 2019 at 10:46:57AM -0700, Pete Wright wrote: hello - i am still having issues with mergemaster when building/installing current on my end as per this thread: https://lists.freebsd.org/pipermail/freebsd-current/2019-May/073403.html my source contains the fix that I think we committed to address the original issue, are there any other steps required to get things working: *** Creating the temporary root environment in /var/tmp/temproot *** /var/tmp/temproot ready for use *** Creating and populating directory structure in /var/tmp/temproot cp: /usr/home/pete/git/freebsd/etc/master.passwd: No such file or directory *** FATAL ERROR: Cannot copy files to the temproot environment cheers, -pete Yes: you need to actually install that (new) version of mergemaster before you try to use it. E.g.: pushd usr.bin/mergemaster && make install; popd Then re-start the userland installation (e.g., "mergemaster -p ...") and proceed with the rest of the install as usual. Ah OK, i think missed that in the thread - and the promised update to the UPDATING file in the commit doesn't seem to have landed yet either. Thanks David! -pete -- Pete Wright p...@nomadlogic.org @nomadlogicLA ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: mergemaster still having issues
On Fri, May 17, 2019 at 10:55:18AM -0700, Pete Wright wrote: > ... > > E.g.: > > pushd usr.bin/mergemaster && make install; popd > > > > Then re-start the userland installation (e.g., "mergemaster -p ...") and > > proceed with the rest of the install as usual. > > Ah OK, i think missed that in the thread - and the promised update to > the UPDATING file in the commit doesn't seem to have landed yet either. > > Thanks David! > -pete > Above is from working/experimenting with Brad; my sense is that things aren't quite settled yet (with respect to UPDATING recommendations). Happy to help when I can. :-) Peace, david -- David H. Wolfskill da...@catwhisker.org One wonders just who benefits from Trump's trade war with China. See http://www.catwhisker.org/~david/publickey.gpg for my public key. signature.asc Description: PGP signature
Re: FreeBSD Core Team Response to Controversial Social Media Posts
Igor et al, Instead of debating definitions of hate speech, free speech, and trying to discover intent, I suggest we focus on right relationships. https://www.youtube.com/watch?v=A14THPoc4-4 Vester On Fri, May 17, 2019, at 12:08 AM, Igor Mozolevsky wrote: > On Sun, 12 May 2019 at 18:28, Igor Mozolevsky wrote: > > On Friday, 10 May 2019, FreeBSD Core Team Secretary > > wrote: > > > > > The FreeBSD Core Team is aware of recent controversial statements made > > > on social media by a FreeBSD developer. We, along with the Code of > > > Conduct review committee, are investigating the matter and will decide > > > what action to take. > > > > > > > > > -- > > > FreeBSD Core Team > > > > This seems to be a wanton violation of Article 19 of the Universal > > Declaration of Human Rights [1]. > > > > 1. https://www.un.org/en/universal-declaration-human-rights/ > > > More applicable if you think that UN declarations don't apply to you:- > https://www.supremecourt.gov/opinions/16pdf/15-1293_1o13.pdf > > > -- > Igor M. > ___ > freebsd-current@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org" >https://www.youtube.com/watch?v=A14THPoc4-4 ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
panic booting with if_tap_load="YES" in loader.conf
I just updated from r346856 to r347950 and ran into a new panic, caused by having if_tap_load="YES" in /boot/loader.conf - because it's already built-in to the kernel: module if_tuntap already present! kernel trap 12 with interrupts disabled The backtrace is: vpanic() panic() trap_fatal() trap_pfault() trap() calltrap() --- trap 0xc _thread_lock() pmap_delayed_invl_start_u() pmap_remove() kmem_bootstrap_free() preload_delete_name() linker_file_unload() linker_preload() mi_startup() btext() Uptime: 1s -- Rebecca Cran ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
panic booting with if_tap_load="YES" in loader.conf
I just updated from r346856 to r347950 and ran into a new panic, caused by having if_tap_load="YES" in /boot/loader.conf - because it's already built-in to the kernel: module if_tuntap already present! kernel trap 12 with interrupts disabled The backtrace is: vpanic() panic() trap_fatal() trap_pfault() trap() calltrap() --- trap 0xc _thread_lock() pmap_delayed_invl_start_u() pmap_remove() kmem_bootstrap_free() preload_delete_name() linker_file_unload() linker_preload() mi_startup() btext() Uptime: 1s -- Rebecca Cran ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: panic booting with if_tap_load="YES" in loader.conf
On Fri, May 17, 2019 at 10:18:57PM -0600, Rebecca Cran wrote:
> I just updated from r346856 to r347950 and ran into a new panic, caused
> by having if_tap_load="YES" in /boot/loader.conf - because it's already
> built-in to the kernel:
I think this patch should fix the panic, but I only compile-tested it.
I considered having the logic live in preload_delete_name() instead, but
the boot-time ucode code must still defer the deletion somewhat.
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index 6ceb34d66b74..10b28d5d375c 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -1179,11 +1179,41 @@ link_elf_unload_file(linker_file_t file)
free(ef->typoff, M_LINKER);
}
+struct pending_unload {
+ charpathname[MAXPATHLEN];
+ SLIST_ENTRY(pending_unload) next;
+};
+SLIST_HEAD(, pending_unload) pending = SLIST_HEAD_INITIALIZER(pending);
+
static void
-link_elf_unload_preload(linker_file_t file)
+link_elf_unload_pending(void *arg __unused)
{
- if (file->pathname != NULL)
+ struct pending_unload *file;
+
+ while ((file = SLIST_FIRST(&pending)) != NULL) {
preload_delete_name(file->pathname);
+ SLIST_REMOVE_HEAD(&pending, next);
+ free(file, M_LINKER);
+ }
+}
+SYSINIT(unload_pending, SI_SUB_CONFIGURE + 1, SI_ORDER_ANY,
+link_elf_unload_pending, NULL);
+
+static void
+link_elf_unload_preload(linker_file_t lf)
+{
+ struct pending_unload *file;
+
+ if (lf->pathname != NULL) {
+ if (!cold) {
+ preload_delete_name(lf->pathname);
+ return;
+ }
+ file = malloc(sizeof(*file), M_LINKER, M_WAITOK);
+ (void)strlcpy(file->pathname, lf->pathname,
+ sizeof(file->pathname));
+ SLIST_INSERT_HEAD(&pending, file, next);
+ }
}
static const char *
___
freebsd-current@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
