package/python-pycrypto: fix legal-info
PATCH 1/1 package/python-pycrypto: fix legal-info
From: "Yann E. MORIN" <[email protected]>
The pycrypto package contains a LICENSE.orig file, but apply-patches.sh removes all .orig file, so we can't list a .orig file asa license file, as it would have disapeared by the time 'make legal-info' sould be called.
Add a post-extract hook that renames this license file, so it is renamed just before we apply patches and remove .orig files.
--- package/python-pycrypto/python-pycrypto.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
package/python-pycrypto/python-pycrypto.mk +11 -1
@@ -11,7 +11,17 @@ PYTHON_PYCRYPTO_SETUP_TYPE = distutils PYTHON_PYCRYPTO_LICENSE = Public Domain, Python 2.2 License (HMAC.py, setup.py) PYTHON_PYCRYPTO_LICENSE_FILES = COPYRIGHT LEGAL/copy/LICENSE.libtom \ - LEGAL/copy/LICENSE.orig LEGAL/copy/LICENSE.python-2.2 + LEGAL/copy/LICENSE.python-2.2 + +# The pycrypto package contains a LICENSE.orig file, but our patching +# infrastrucure removes all .orig file, so we must rename that license +# file prior to patching, so it is still available to the legal-info +# infrastructure +define PYTHON_PYCRYPTO_RENAME_LICENSE + mv $(@D)/LEGAL/copy/LICENSE.orig $(@D)/LEGAL/copy/LICENSE.original +endef +PYTHON_PYCRYPTO_POST_EXTRACT_HOOKS += PYTHON_PYCRYPTO_RENAME_LICENSE +PYTHON_PYCRYPTO_LICENSE_FILES += LEGAL/copy/LICENSE.original PYTHON_PYCRYPTO_DEPENDENCIES = gmp
Signature · 1 line
1.8.1.2
PATCH 1/1 package/python-pycrypto: fix legal-info
Hi Yann,
Quoted 4 lines · Yann E. MORIN
From: "Yann E. MORIN" <[email protected]>
The pycrypto package contains a LICENSE.orig file, but
apply-patches.shremoves all .orig file, so we can't list a .orig file asa license file,
as a
Quoted 17 lines
as it would have disapeared by the time 'make legal-info' sould be called.
Add a post-extract hook that renames this license file, so it is renamed just before we apply patches and remove .orig files.
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Ryan Barnett <[email protected]>--- package/python-pycrypto/python-pycrypto.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)package/python-pycrypto/python-pycrypto.mk +0
-0
package/python-pycrypto/python-pycrypto.mk PYTHON_PYCRYPTO_SETUP_TYPE = distutils · line 14
Quoted 5 lines
package/python-pycrypto/python-pycrypto.mk +1
-1@@ -11,7 +11,17 @@ PYTHON_PYCRYPTO_SETUP_TYPE = distutils PYTHON_PYCRYPTO_LICENSE = Public Domain, Python 2.2 License (HMAC.py, setup.py) PYTHON_PYCRYPTO_LICENSE_FILES = COPYRIGHT LEGAL/copy/LICENSE.libtom \ - LEGAL/copy/LICENSE.orig LEGAL/copy/LICENSE.python-2.2 + LEGAL/copy/LICENSE.python-2.2
You remove LICENSE.orig from the list, but don't add LICENSE.original.
package/python-pycrypto/python-pycrypto.mk PYTHON_PYCRYPTO_SETUP_TYPE = distutils · line 26
Quoted 12 lines
package/python-pycrypto/python-pycrypto.mk +10
-0+ +# The pycrypto package contains a LICENSE.orig file, but our patching +# infrastrucure removes all .orig file, so we must rename that license +# file prior to patching, so it is still available to the legal-info +# infrastructure +define PYTHON_PYCRYPTO_RENAME_LICENSE + mv $(@D)/LEGAL/copy/LICENSE.orig $(@D)/LEGAL/copy/LICENSE.original +endef +PYTHON_PYCRYPTO_POST_EXTRACT_HOOKS += PYTHON_PYCRYPTO_RENAME_LICENSE +PYTHON_PYCRYPTO_LICENSE_FILES += LEGAL/copy/LICENSE.original PYTHON_PYCRYPTO_DEPENDENCIES = gmp
baruch
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -PATCH 1/1 package/python-pycrypto: fix legal-info
Baruch, All,
On 2013-12-23 20:21 +0200, Baruch Siach spake thusly:
Quoted 9 lines
Hi Yann,
Quoted 4 lines · Yann E. MORIN
From: "Yann E. MORIN" <[email protected]>
The pycrypto package contains a LICENSE.orig file, but
apply-patches.shremoves all .orig file, so we can't list a .orig file asa license file,as a
Indeed! ;-)
Quoted 18 lines
Quoted 18 lines
as it would have disapeared by the time 'make legal-info' sould be called.
Add a post-extract hook that renames this license file, so it is renamed just before we apply patches and remove .orig files.
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Ryan Barnett <[email protected]>--- package/python-pycrypto/python-pycrypto.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)package/python-pycrypto/python-pycrypto.mk +0
-0@@ -11,7 +11,17 @@ PYTHON_PYCRYPTO_SETUP_TYPE = distutils
Quoted 6 lines
package/python-pycrypto/python-pycrypto.mk PYTHON_PYCRYPTO_SETUP_TYPE = distutils · line 14
Quoted 4 lines
package/python-pycrypto/python-pycrypto.mk +1
-1PYTHON_PYCRYPTO_LICENSE = Public Domain, Python 2.2 License (HMAC.py, setup.py) PYTHON_PYCRYPTO_LICENSE_FILES = COPYRIGHT LEGAL/copy/LICENSE.libtom \ - LEGAL/copy/LICENSE.orig LEGAL/copy/LICENSE.python-2.2 + LEGAL/copy/LICENSE.python-2.2You remove LICENSE.orig from the list, but don't add LICENSE.original.
Yes I do. See below...
Quoted 10 lines
package/python-pycrypto/python-pycrypto.mk PYTHON_PYCRYPTO_SETUP_TYPE = distutils · line 24
Quoted 10 lines
package/python-pycrypto/python-pycrypto.mk +10
-0+ +# The pycrypto package contains a LICENSE.orig file, but our patching +# infrastrucure removes all .orig file, so we must rename that license +# file prior to patching, so it is still available to the legal-info +# infrastructure +define PYTHON_PYCRYPTO_RENAME_LICENSE + mv $(@D)/LEGAL/copy/LICENSE.orig $(@D)/LEGAL/copy/LICENSE.original +endef +PYTHON_PYCRYPTO_POST_EXTRACT_HOOKS += PYTHON_PYCRYPTO_RENAME_LICENSE +PYTHON_PYCRYPTO_LICENSE_FILES += LEGAL/copy/LICENSE.original
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
... here.
I did explicitly moved it down so it is obvious the license file we install is the one we renamed.
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Thomas Petazzoni
AppliedPATCH 1/1 package/python-pycrypto: fix legal-info
In reply to Yann E. MORINDear Yann E. MORIN,
Quoted 9 lines · Yann E. MORIN
From: "Yann E. MORIN" <[email protected]>
The pycrypto package contains a LICENSE.orig file, but
apply-patches.shremoves all .orig file, so we can't list a .orig file asa license file, as it would have disapeared by the time 'make legal-info' sould be called.Add a post-extract hook that renames this license file, so it is renamed just before we apply patches and remove .orig files.
Quoted 6 lines
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Ryan Barnett <[email protected]>--- package/python-pycrypto/python-pycrypto.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
Applied, thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com