summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-04-03 18:11:30 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-04-03 18:11:30 (EDT)
commit5cbcb3b5f91bea4149cba02544ccaff1f232328f (patch)
tree1eee3d02307b8a2f3ad17d8a0ab0d11c088e18eb
parentacbff35a80d06c20286efa586fbc8b674c6b5b4d (diff)
ob-checkbuilddeps, NEWS: Fix comment about opkg versions
Also update copyright years.
-rw-r--r--NEWS9
-rw-r--r--src/ob-checkbuilddeps.sh10
2 files changed, 10 insertions, 9 deletions
diff --git a/NEWS b/NEWS
index 007648c..eca4ef6 100644
--- a/NEWS
+++ b/NEWS
@@ -7,10 +7,11 @@ The "bug fixes break my workflow" release.
Bug fixes and minor changes:
- * opkg-lede commit 93de62b reversed the exit status of the
- check-versions subcommand. ob-checkbuilddeps now detects whether
- the exit status is reversed, to support build dependency version
- comparisons with either "classic" (now Yocto) opkg or opkg-lede.
+ * Recent versions of opkg (and opkg-lede) fix the previously reversed
+ exit status of the check-versions subcommand. ob-checkbuilddeps
+ now detects whether the exit status is reversed, to support build
+ dependency version comparisons with any version of opkg (or
+ opkg-lede).
opkbuild version 4.0.1
----------------------
diff --git a/src/ob-checkbuilddeps.sh b/src/ob-checkbuilddeps.sh
index 1bfbe7f..0621111 100644
--- a/src/ob-checkbuilddeps.sh
+++ b/src/ob-checkbuilddeps.sh
@@ -1,6 +1,6 @@
# Make sure that package build dependencies are installed
#
-# Copyright (C) 2012, 2014 Patrick McDermott
+# Copyright (C) 2012, 2014, 2019 Patrick McDermott
#
# This file is part of opkbuild.
#
@@ -28,10 +28,10 @@ compare_versions()
local dep_ver="${3}"
shift 3
- # "Classic" (now Yocto) opkg returns 1 on a true comparison and 0 on a
- # false comparison. opkg-lede reversed this in commit 93de62b. Compare
- # the compare-versions exit status with a reference exit status from a
- # true statement (1 << 2).
+ # Older versions of opkg return 1 on a true comparison and 0 on a false
+ # comparison. "Classic"/Yocto opkg commit d55020a (opkg-lede commit
+ # 93de62b) reversed this. Compare the compare-versions exit status with
+ # a reference exit status from a true statement (1 << 2).
! "${OPKG}" compare-versions "${pkg_ver}" "${dep_rel}" "${dep_ver}"
# The "-e" setting is ignored while executing anything, including
# commands in a function, within the context of the condition of an "if"