On Thu, 2024-03-14 15:04:44 +0000, Taylor R Campbell <riastradh%NetBSD.org@localhost> wrote:
> > Date: Thu, 14 Mar 2024 09:00:38 +0000
> > From: jbglaw%lug-owl.de@localhost
> >
> > -IMAGEPREBUILD= ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR}
> > +IMAGEPREBUILD= (cd ${DESTDIR} && ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp libdata/firmware ${WORKDIR})
>
> ${WORKDIR} is probably a relative path `work', in which case this will
> copy ${DESTDIR}/libdata/firmware to ${DESTDIR}/work/libdata/firmware,
> which explains the checkflist errors you saw.
>
> Can you try this change instead?
>
> -IMAGEPREBUILD= ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR}
> +IMAGEPREBUILD= (cd ${DESTDIR} && ${TOOL_PAX} ${PAX_TIMESTAMP} -w libdata/firmware) | (cd ${WORKDIR} && ${TOOL_PAX} -r -pp)
I tried this exact patch:
diff --git a/distrib/evbarm/instkernel/sshramdisk/Makefile b/distrib/evbarm/instkernel/sshramdisk/Makefile
index 95aec3490f5c..d35d1f99ffab 100644
--- a/distrib/evbarm/instkernel/sshramdisk/Makefile
+++ b/distrib/evbarm/instkernel/sshramdisk/Makefile
@@ -29,7 +29,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/group \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
-IMAGEPREBUILD= ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR}
+IMAGEPREBUILD= (cd ${DESTDIR} && ${TOOL_PAX} ${PAX_TIMESTAMP} -w libdata/firmware) | (cd ${WORKDIR} && ${TOOL_PAX} -r -pp)
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
...this builds successfully and the firmware files seem to end up in a
reasonable place:
root@lili:/tmp/netbsd-earmv6-test1/NetBSD-src/distrib/evbarm/instkernel/sshramdisk/obj/work [trunk] # find|grep firmwa|grep uco|head -10
./libdata/firmware/if_iwm/LICENSE.iwlwifi-3168-ucode
./libdata/firmware/if_iwm/README.iwlwifi-3168-ucode
./libdata/firmware/if_iwm/iwlwifi-3160-17.ucode
./libdata/firmware/if_iwm/iwlwifi-7265D-22.ucode
./libdata/firmware/if_iwm/README.iwlwifi-3160-ucode
./libdata/firmware/if_iwm/README.iwlwifi-7265-ucode
./libdata/firmware/if_iwm/README.iwlwifi-8000-ucode
./libdata/firmware/if_iwm/README.iwlwifi-7260-ucode
./libdata/firmware/if_iwm/LICENSE.iwlwifi-8000-ucode
./libdata/firmware/if_iwm/LICENSE.iwlwifi-7260-ucode
I obviously didn't try to _use_ the resulting installer, but it seems
to be more correct than before and this also fixes the RB issue I
noticed. Would somebody apply the patch?
Thanks,
Jan-Benedict
--
Attachment:
signature.asc
Description: PGP signature