Re: port-evbarm/58035: [RB] evbarm/earmv6: sshramdisk probably has firmware files in a wrong place

[Jan-Benedict Glaw <jbglaw%lug-owl.de@localhost>]

The following reply was made to PR port-evbarm/58035; it has been noted by GNATS.

From: Jan-Benedict Glaw <jbglaw%lug-owl.de@localhost>
To: Taylor R Campbell <riastradh%NetBSD.org@localhost>
Cc: gnats-bugs%NetBSD.org@localhost, netbsd-bugs%NetBSD.org@localhost
Subject: Re: port-evbarm/58035: [RB] evbarm/earmv6: sshramdisk probably has
 firmware files in a wrong place
Date: Thu, 14 Mar 2024 19:35:06 +0100

 --p7S+EREVcBHk3zUG
 Content-Type: text/plain; charset=utf-8
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 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
 > >=20
 > > -IMAGEPREBUILD=3D ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${DESTDIR}/libda=
 ta/firmware ${WORKDIR}
 > > +IMAGEPREBUILD=3D (cd ${DESTDIR} && ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -p=
 p libdata/firmware ${WORKDIR})
 >=20
 > ${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.
 >=20
 > Can you try this change instead?
 >=20
 > -IMAGEPREBUILD=3D	${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${DESTDIR}/libdata=
 /firmware ${WORKDIR}
 > +IMAGEPREBUILD=3D	(cd ${DESTDIR} && ${TOOL_PAX} ${PAX_TIMESTAMP} -w libda=
 ta/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=3D	${CRUNCHBIN} \
  		${NETBSDSRCDIR}/etc/group \
  		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
  		${DISTRIBDIR}/common/services
 -IMAGEPREBUILD=3D	${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${DESTDIR}/libdata/f=
 irmware ${WORKDIR}
 +IMAGEPREBUILD=3D	(cd ${DESTDIR} && ${TOOL_PAX} ${PAX_TIMESTAMP} -w libdata=
 /firmware) | (cd ${WORKDIR} && ${TOOL_PAX} -r -pp)
 =20
  # Use stubs to eliminate some large stuff from libc
  HACKSRC=3D	${DISTRIBDIR}/utils/libhack
 
 
 =2E..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/ssh=
 ramdisk/obj/work [trunk] # find|grep firmwa|grep uco|head -10
 =2E/libdata/firmware/if_iwm/LICENSE.iwlwifi-3168-ucode
 =2E/libdata/firmware/if_iwm/README.iwlwifi-3168-ucode
 =2E/libdata/firmware/if_iwm/iwlwifi-3160-17.ucode
 =2E/libdata/firmware/if_iwm/iwlwifi-7265D-22.ucode
 =2E/libdata/firmware/if_iwm/README.iwlwifi-3160-ucode
 =2E/libdata/firmware/if_iwm/README.iwlwifi-7265-ucode
 =2E/libdata/firmware/if_iwm/README.iwlwifi-8000-ucode
 =2E/libdata/firmware/if_iwm/README.iwlwifi-7260-ucode
 =2E/libdata/firmware/if_iwm/LICENSE.iwlwifi-8000-ucode
 =2E/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
 --=20
 
 --p7S+EREVcBHk3zUG
 Content-Type: application/pgp-signature; name="signature.asc"
 
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQQlDTvPcScNjKREqWEdvV51g5nhuwUCZfNDWAAKCRAdvV51g5nh
 u5zaAJ4svCitml+pYDXqm333O40eAoibDgCeNAMhJc9ZiBqsDT6mUVsm1JLfAps=
 =DV3l
 -----END PGP SIGNATURE-----
 
 --p7S+EREVcBHk3zUG--