浏览代码

package/tzdata: do extract to get the license file

Back in 2014, about 6 years ago now, in my infinite wisdom, I
decided that extracting the tzdata source was not necessary 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.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Richard Braun <rbraun@sceen.net>
Cc: Martin Bark <martin@barkynet.com>
Cc: Christopher McCrory <chrismcc@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 5c0c4861bea31b5ecbf13e4a0a0a987c15e0d154)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Yann E. MORIN 5 年之前
父节点
当前提交
0cba056b9c
共有 1 个文件被更改,包括 1 次插入4 次删除
  1. 1 4
      package/tzdata/tzdata.mk

+ 1 - 4
package/tzdata/tzdata.mk

@@ -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