diff options
| author | Seonah Moon <seonah1.moon@samsung.com> | 2022-01-12 16:43:03 +0900 |
|---|---|---|
| committer | Seonah Moon <seonah1.moon@samsung.com> | 2022-01-12 16:49:46 +0900 |
| commit | aff4fe95c96ee39f595d743b29245b5813bdece1 (patch) | |
| tree | 424758e17c91dfd12845449a2061cf5cf2627b65 /bld | |
| parent | 9a9940fac7c8116d02571a84692e25396a4cfcfc (diff) | |
| parent | d08de9e4ac117490e1bc53b587ee68681ef0fbe9 (diff) | |
| download | dnsmasq-tizen_7.0.tar.gz dnsmasq-tizen_7.0.tar.bz2 dnsmasq-tizen_7.0.zip | |
Merge tag 'upstream/2.86' into tizentizen_7.0_m2_releasesubmit/tizen/20220113.081517accepted/tizen/unified/20220117.134951accepted/tizen/7.0/unified/hotfix/20221116.110714accepted/tizen/7.0/unified/20221110.061034tizen_7.0_hotfixtizen_7.0accepted/tizen_7.0_unified_hotfixaccepted/tizen_7.0_unified
Change-Id: I8c4bbd0b37b8789579fb2e3ac4cdfb7472a9a114
Diffstat (limited to 'bld')
| -rw-r--r-- | bld/Android.mk | 3 | ||||
| -rwxr-xr-x | bld/get-version | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/bld/Android.mk b/bld/Android.mk index f924be9..917f8dc 100644 --- a/bld/Android.mk +++ b/bld/Android.mk @@ -11,7 +11,8 @@ LOCAL_SRC_FILES := bpf.c cache.c dbus.c dhcp.c dnsmasq.c \ radv.c slaac.c auth.c ipset.c domain.c \ dnssec.c dnssec-openssl.c blockdata.c tables.c \ loop.c inotify.c poll.c rrfilter.c edns0.c arp.c \ - crypto.c dump.c ubus.c metrics.c hash_questions.c + crypto.c dump.c ubus.c metrics.c hash-questions.c \ + domain-match.c LOCAL_MODULE := dnsmasq diff --git a/bld/get-version b/bld/get-version index e472aab..1f51768 100755 --- a/bld/get-version +++ b/bld/get-version @@ -9,7 +9,10 @@ # If we can find one which matches $v[0-9].* then we assume it's # a version-number tag, else we just use the whole string. # If there is more than one v[0-9].* tag, sort them and use the -# first. This favours, eg v2.63 over 2.63rc6. +# first. The insane arguments to the sort command are to ensure +# that, eg v2.64 comes before v2.63, but v2.63 comes before v2.63rc1 +# and v2.63rc1 comes before v2.63test1 + # Change directory to the toplevel source directory. if test -z "$1" || ! test -d "$1" || ! cd "$1"; then @@ -28,7 +31,7 @@ else vers=`cat $1/VERSION | sed 's/[(), ]/,/ g' | tr ',' '\n' | grep ^v[0-9]` if [ $? -eq 0 ]; then - echo "${vers}" | sort -r | head -n 1 | sed 's/^v//' + echo "${vers}" | sort -k1.2,1.5Vr -k1.6,1.6 -k1.8,1.9Vr -k1.10,1.11Vr | head -n 1 | sed 's/^v//' else cat $1/VERSION fi |