Skip to content

Conversation

dch
Copy link
Contributor

@dch dch commented Nov 28, 2019

  • recursecopylib fails to locate dependencies for miniroot
  • make -C invocation is probably only needed for from-source builds

I am not certain that either of these patches are correct but they
definitely work for me here. I'm happy to amend as required.

@dch dch force-pushed the fix/make-image-work-again branch from 7ca8c12 to 348b07e Compare December 4, 2019 22:01
@dch dch force-pushed the fix/make-image-work-again branch from 348b07e to 8cd4c3a Compare December 4, 2019 22:33
@kevans91
Copy link
Contributor

kevans91 commented Dec 4, 2019

Replacing $2 == "NEEDED" with match($2, "\\(?NEEDED\\)?") would be an easy win for compatibility with llvm/binutils readelf in addition to elftoolchain.

[ ! -f ${POUDRIERED}/image-${JAILNAME}-src.conf ] || cat ${POUDRIERED}/image-${JAILNAME}-src.conf >> ${WRKDIR}/src.conf
[ ! -f ${POUDRIERED}/image-${JAILNAME}-${SETNAME}-src.conf ] || cat ${POUDRIERED}/image-${JAILNAME}-${SETNAME}-src.conf >> ${WRKDIR}/src.conf
make -C ${mnt}/usr/src DESTDIR=${WRKDIR}/world BATCH_DELETE_OLD_FILES=yes SRCCONF=${WRKDIR}/src.conf delete-old delete-old-libs
[ -f "${mnt}/usr/src/Makefile" ] && make -C ${mnt}/usr/src DESTDIR=${WRKDIR}/world BATCH_DELETE_OLD_FILES=yes SRCCONF=${WRKDIR}/src.conf delete-old delete-old-libs
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think more thought is needed here.

  1. Why are we setting up a src.conf if it won't be used?
  2. What about the /usr/src reference at OSVERSION=$(awk -F '"' '/REVISION=/ { print $2 }' ${mnt}/usr/src/sys/conf/newvers.sh | cut -d '.' -f 1)
  3. and install ${mnt}/usr/src/tools/tools/nanobsd/Files/root/save_cfg ${WRKDIR}/world/conf/base/etc/

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants