summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2014-01-07 13:30:21 (EST)
committer P. J. McDermott <pjm@nac.net>2014-01-07 13:30:21 (EST)
commit8f9650ad91bd9b31b20f57a554de0aa3e28426df (patch)
tree296925b339a966644fd96087a755f6d93e0a9a07
parenta8ceee27bcca216d7a0391bca48dcf80cac4baf9 (diff)
build: Move rm command in installation.
Should fix these opkg errors: * check_data_file_clashes: Package tzdata-etcetera wants to install file /usr/share/zoneinfo/Etc/Zulu But that file is already provided by package * tzdata * check_data_file_clashes: Package tzdata-etcetera wants to install file /usr/share/zoneinfo/Etc/Universal But that file is already provided by package * tzdata * opkg_install_cmd: Cannot install package tzdata-etcetera.
-rwxr-xr-xbuild2
1 files changed, 1 insertions, 1 deletions
diff --git a/build b/build
index 34bcdf5..eb1e33c 100755
--- a/build
+++ b/build
@@ -37,12 +37,12 @@ install: build
# Install time zones.
for t in $(tables); do \
grep '^Link' src/$${t} | while read type dest src etc; do \
+ rm -f "$${p}.data/usr/share/zoneinfo/$${src}"; \
if [ x"$${dest}" = x'Etc/UTC' ]; then \
p='tzdata'; \
else \
p="tzdata-$${t}"; \
fi; \
- rm -f "$${p}.data/usr/share/zoneinfo/$${src}"; \
link="$${src}" up=''; \
while [ x"$${link#*/}" != x"$${link}" ] && \
[ x"$${link%%/*}" = x"$${dest%%/*}" ]; do \