package/tzdata: do extract to get the license file
PATCH 1/1 package/tzdata: do extract to get the license file
Back in 2014, about 6 years ago now, in my inifinite wisdom, I decided that extracting the tzdata source was not nwcessary for the target variant, because we would be installing the files generated by the host variant, in commit 7aad5daa5d (package/tzdata:
only compile the zoneinfo once).
However, that did not account for the fact that we would eventually like to have the licensing information for tzdata, later added in 2019, in commit 60889ccdf0 (package/tzdata: bump to version 2019b).
However, that last comit only added the license file to the host variant, without explanations why that was so. It turns out that the reason it was not added to the target variant is, probably, that he source code for the target variant is not extracted, and thus saving the license file fails.
But we really want the license file for what goes on into the target.
So, do extract the source code for the target variant, even if only to get the license file.
--- package/tzdata/tzdata.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
package/tzdata/tzdata.mk +1 -4
@@ -11,7 +11,7 @@ TZDATA_STRIP_COMPONENTS = 0 TZDATA_DEPENDENCIES = host-tzdata HOST_TZDATA_DEPENDENCIES = host-zic TZDATA_LICENSE = Public domain -HOST_TZDATA_LICENSE_FILES = LICENSE +TZDATA_LICENSE_FILES = LICENSE # Take care when re-ordering this list since this might break zone # dependencies
@@ -38,9 +38,6 @@ define TZDATA_SET_LOCALTIME endef endif -# No need to extract for target, we're using the host-installed files -TZDATA_EXTRACT_CMDS = - define TZDATA_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/zoneinfo cp -a $(HOST_DIR)/share/zoneinfo/* $(TARGET_DIR)/usr/share/zoneinfo
Signature · 1 line
2.20.1
Thomas Petazzoni
AppliedPATCH 1/1 package/tzdata: do extract to get the license file
Quoted 21 lines · On Mon, 27 Apr 2020 22:36:08 +0200 "Yann E. MORIN" <[email protected]>…
Back in 2014, about 6 years ago now, in my inifinite wisdom, I decided that extracting the tzdata source was not nwcessary for the target variant, because we would be installing the files generated by the host variant, in commit
7aad5daa5d(package/tzdata:
only compile the zoneinfo once).However, that did not account for the fact that we would eventually like to have the licensing information for tzdata, later added in 2019, in commit
60889ccdf0(package/tzdata: bump to version 2019b).However, that last comit only added the license file to the host variant, without explanations why that was so. It turns out that the reason it was not added to the target variant is, probably, that he source code for the target variant is not extracted, and thus saving the license file fails.
But we really want the license file for what goes on into the target.
So, do extract the source code for the target variant, even if only to get the license file.
Quoted 7 lines
Signed-off-by Yann E. MORIN <[email protected]>Cc Richard Braun <[email protected]>Cc Martin Bark <[email protected]>Cc Christopher McCrory <[email protected]>--- package/tzdata/tzdata.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/tzdata: do extract to get the license file
In reply to Yann E. MORINQuoted 20 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Back in 2014, about 6 years ago now, in my inifinite wisdom, I decided that extracting the tzdata source was not nwcessary for the target variant, because we would be installing the files generated by the host variant, in commit
7aad5daa5d(package/tzdata:
only compile the zoneinfo once).However, that did not account for the fact that we would eventually like to have the licensing information for tzdata, later added in 2019, in commit
60889ccdf0(package/tzdata: bump to version 2019b).However, that last comit only added the license file to the host variant, without explanations why that was so. It turns out that the reason it was not added to the target variant is, probably, that he source code for the target variant is not extracted, and thus saving the license file fails.
But we really want the license file for what goes on into the target.
Quoted 7 lines
So, do extract the source code for the target variant, even if only to get the license file.
Signed-off-by Yann E. MORIN <[email protected]>Cc Richard Braun <[email protected]>Cc Martin Bark <[email protected]>Cc Christopher McCrory <[email protected]>
Committed to 2020.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard