From 8f9650ad91bd9b31b20f57a554de0aa3e28426df Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Tue, 07 Jan 2014 13:30:21 -0500 Subject: 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. --- (limited to 'build') 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 \ -- cgit v0.9.1