Manuel Bouyer <bouyer%antioche.eu.org@localhost> writes: > On Mon, Jul 04, 2022 at 05:32:33PM +0100, Jonathan Perkin wrote: >> * On 2022-07-04 at 17:29 BST, Manuel Bouyer wrote: >> >> > so, since xentools415 has been converted to python/egg.mk (from extention.mk) >> > we get a warning about do-build and do-install being redefined. >> >> Generally we handle this by adding .if !target(do-build) style wrappers >> around the definitions in extension.mk. Is there any reason why we're not >> doing that in this case? > > These are already conditional on PYDISTUTILSPKG, I'm just extending this > logic. Note that PYDISTUTILSPKG also conditionally defines more stuff than > the do-* targets; I don't know if they can cause problem for packages > that don't want the build logic from egg.mk Starting out with the assumption that egg.mk use is proper, the root cause here is that egg.mk is doing two things, and it seems best to cleanly separate them somehow, rather than opting out of duplicates individually. The first question is if egg.mk as it stands always intends to build as well as define whatever is needed for an egg presence. The second issue is that egg.mk appears to deal with one egg, and some packages have more. Reading egg.mk, it strikes me that the proposed approach is to disable everything in egg.mk except extension.mk. So I think the right thing is just to use extension.mk instead. That is reverting 1.9 of Makefile, and that commit does not have an explanation of why it is correct. I assert that it is not correct because of: - adding wrong build machinery (not used, and conflicting with the package's build system) - ending up with an EGG_NAME of xen-4.15.2, which is wrong, and results in EGG_NAME not ending up in PLIST and thus not useful I've appended the python PLIST entries. It's clear that there are two eggs: pygrub-0.6 and xen-3.0. So I say back out 1.9 and then things are ok. wiz and oskar copied to explain if I'm confused. ${PYSITELIB}/grub/ExtLinuxConf.py ${PYSITELIB}/grub/ExtLinuxConf.pyc ${PYSITELIB}/grub/GrubConf.py ${PYSITELIB}/grub/GrubConf.pyc ${PYSITELIB}/grub/LiloConf.py ${PYSITELIB}/grub/LiloConf.pyc ${PYSITELIB}/grub/__init__.py ${PYSITELIB}/grub/__init__.pyc ${PYSITELIB}/pygrub-0.6-py${PYVERSSUFFIX}.egg-info/PKG-INFO ${PYSITELIB}/pygrub-0.6-py${PYVERSSUFFIX}.egg-info/SOURCES.txt ${PYSITELIB}/pygrub-0.6-py${PYVERSSUFFIX}.egg-info/dependency_links.txt ${PYSITELIB}/pygrub-0.6-py${PYVERSSUFFIX}.egg-info/top_level.txt ${PYSITELIB}/xen-3.0-py${PYVERSSUFFIX}.egg-info/PKG-INFO ${PYSITELIB}/xen-3.0-py${PYVERSSUFFIX}.egg-info/SOURCES.txt ${PYSITELIB}/xen-3.0-py${PYVERSSUFFIX}.egg-info/dependency_links.txt ${PYSITELIB}/xen-3.0-py${PYVERSSUFFIX}.egg-info/top_level.txt ${PYSITELIB}/xen/__init__.py ${PYSITELIB}/xen/__init__.pyc ${PYSITELIB}/xen/lowlevel/__init__.py ${PYSITELIB}/xen/lowlevel/__init__.pyc ${PYSITELIB}/xen/lowlevel/xc.so ${PYSITELIB}/xen/lowlevel/xs.so ${PYSITELIB}/xen/migration/__init__.py ${PYSITELIB}/xen/migration/__init__.pyc ${PYSITELIB}/xen/migration/legacy.py ${PYSITELIB}/xen/migration/legacy.pyc ${PYSITELIB}/xen/migration/libxc.py ${PYSITELIB}/xen/migration/libxc.pyc ${PYSITELIB}/xen/migration/libxl.py ${PYSITELIB}/xen/migration/libxl.pyc ${PYSITELIB}/xen/migration/public.py ${PYSITELIB}/xen/migration/public.pyc ${PYSITELIB}/xen/migration/tests.py ${PYSITELIB}/xen/migration/tests.pyc ${PYSITELIB}/xen/migration/verify.py ${PYSITELIB}/xen/migration/verify.pyc ${PYSITELIB}/xen/migration/xl.py ${PYSITELIB}/xen/migration/xl.pyc ${PYSITELIB}/xen/util.py ${PYSITELIB}/xen/util.pyc ${PYSITELIB}/xenfsimage.so
Attachment:
signature.asc
Description: PGP signature