| Message ID | 20240817193733.858704-1-thomas.petazzoni@bootlin.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/python-huepy: add patch to fix LICENSE file installation | expand |
Thomas, All, On 2024-08-17 21:37 +0200, Thomas Petazzoni via buildroot spake thusly: > The python-huepy has an incorrect data_files statement in its > setup.py, causing the LICENSE file to be installed directly as > $(TARGET_DIR)/LICENSE. This was detected because several packages were > doing this, and the second package doing > it (python-unittest-xml-reporting, fixed separately) was erroring out > when trying to overwrite this already existing file. > > This commit fixes the case of python-huepy by adding a patch that has > been submitted upstream. > > There are no autobuilder failures related to python-huepy, but this > was detected while fixing > http://autobuild.buildroot.net/results/2c91243b440087bbc7d051d65f553f59d05dd207/ > for python-unittest-xml-reporting. > > This bug has been in huepy since at least 2018, so this patch can be > backported to previous Buildroot versions. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...ta_files-installs-LICENSE-to-incorre.patch | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 package/python-huepy/0001-setup.py-drop-data_files-installs-LICENSE-to-incorre.patch > > diff --git a/package/python-huepy/0001-setup.py-drop-data_files-installs-LICENSE-to-incorre.patch b/package/python-huepy/0001-setup.py-drop-data_files-installs-LICENSE-to-incorre.patch > new file mode 100644 > index 0000000000..3c50a44377 > --- /dev/null > +++ b/package/python-huepy/0001-setup.py-drop-data_files-installs-LICENSE-to-incorre.patch > @@ -0,0 +1,38 @@ > +From ee3010004a005bc852e6b9318807f373bd89e901 Mon Sep 17 00:00:00 2001 > +From: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > +Date: Sat, 17 Aug 2024 14:10:16 +0200 > +Subject: [PATCH] setup.py: drop data_files, installs LICENSE to incorrect > + place > + > +The data_files statement in the setup() calls installs the LICENSE > +file in the wrong place: in /usr/LICENSE, or even /LICENSE depending > +on the configuration. > + > +So let's drop this, and let setuptools install the LICENSE file > +automatically: since setuptools v56, the license_files attribute is > +automatically assigned to a default value, which includes "LICENSE", > +so there is in fact nothing to do to the get the LICENSE file > +installed at the correct location. See > +https://setuptools.pypa.io/en/latest/history.html#v56-0-0. > + > +Upstream: https://github.com/s0md3v/huepy/pull/42 > +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > +--- > + setup.py | 1 - > + 1 file changed, 1 deletion(-) > + > +diff --git a/setup.py b/setup.py > +index 8b5a726..bd41f1c 100644 > +--- a/setup.py > ++++ b/setup.py > +@@ -30,7 +30,6 @@ setup( > + keywords='hue, color, terminal color, colorama', > + packages=find_packages(), > + py_modules=['huepy'], > +- data_files=[('', ['LICENSE'])], > + include_package_data=True, > + classifiers=[ > + 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', > +-- > +2.46.0 > + > -- > 2.46.0 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/package/python-huepy/0001-setup.py-drop-data_files-installs-LICENSE-to-incorre.patch b/package/python-huepy/0001-setup.py-drop-data_files-installs-LICENSE-to-incorre.patch new file mode 100644 index 0000000000..3c50a44377 --- /dev/null +++ b/package/python-huepy/0001-setup.py-drop-data_files-installs-LICENSE-to-incorre.patch @@ -0,0 +1,38 @@ +From ee3010004a005bc852e6b9318807f373bd89e901 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +Date: Sat, 17 Aug 2024 14:10:16 +0200 +Subject: [PATCH] setup.py: drop data_files, installs LICENSE to incorrect + place + +The data_files statement in the setup() calls installs the LICENSE +file in the wrong place: in /usr/LICENSE, or even /LICENSE depending +on the configuration. + +So let's drop this, and let setuptools install the LICENSE file +automatically: since setuptools v56, the license_files attribute is +automatically assigned to a default value, which includes "LICENSE", +so there is in fact nothing to do to the get the LICENSE file +installed at the correct location. See +https://setuptools.pypa.io/en/latest/history.html#v56-0-0. + +Upstream: https://github.com/s0md3v/huepy/pull/42 +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 8b5a726..bd41f1c 100644 +--- a/setup.py ++++ b/setup.py +@@ -30,7 +30,6 @@ setup( + keywords='hue, color, terminal color, colorama', + packages=find_packages(), + py_modules=['huepy'], +- data_files=[('', ['LICENSE'])], + include_package_data=True, + classifiers=[ + 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', +-- +2.46.0 +
The python-huepy has an incorrect data_files statement in its setup.py, causing the LICENSE file to be installed directly as $(TARGET_DIR)/LICENSE. This was detected because several packages were doing this, and the second package doing it (python-unittest-xml-reporting, fixed separately) was erroring out when trying to overwrite this already existing file. This commit fixes the case of python-huepy by adding a patch that has been submitted upstream. There are no autobuilder failures related to python-huepy, but this was detected while fixing http://autobuild.buildroot.net/results/2c91243b440087bbc7d051d65f553f59d05dd207/ for python-unittest-xml-reporting. This bug has been in huepy since at least 2018, so this patch can be backported to previous Buildroot versions. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> --- ...ta_files-installs-LICENSE-to-incorre.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/python-huepy/0001-setup.py-drop-data_files-installs-LICENSE-to-incorre.patch