summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2023-09-27 13:56:30 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2023-09-27 13:56:30 (EDT)
commit4416ddff5176fce75e50671d20ed0f3c6ee3d4e4 (patch)
tree2264f9e6d910cfc25e44216eed383523dff712c1
parent7092aeb98966cd8468e5ae179468e2cc578bb113 (diff)
ppt-make, ppt-mkpkgs: Bump opkbuild versionHEADmaster
Also add "if not already done" to ppt-mkpkgs recommendation.
-rw-r--r--changelog12
-rw-r--r--src/2/ppt-mkpkgs3
-rw-r--r--src/3/ppt-mkpkgs3
-rw-r--r--src/ppt-make2
4 files changed, 17 insertions, 3 deletions
diff --git a/changelog b/changelog
index aa7d80a..65d2461 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,15 @@
+platconf-pkg-tools (3.0.1+dev) trunk
+
+ * The minimum required version of opkbuild recommended by ppt-make and
+ ppt-mkpkgs is now 4.2.1-3. Version 4.2.1 is required because
+ ppt-make generates a Build-Depends field with newline characters,
+ which older versions of opkbuild don't handle correctly. Version
+ 4.2.1-3 or later is recommended in case the platform configuration
+ maintainer uses newline characters in binary package dependency
+ lists in the substitution variables file.
+
+ -- Patrick McDermott <patrick.mcdermott@libiquity.com> Wed, 27 Sep 2023 13:49:08 -0400
+
platconf-pkg-tools (3.0.1) trunk
* build.mk files no longer throw an error when <src/build/> or
diff --git a/src/2/ppt-mkpkgs b/src/2/ppt-mkpkgs
index 06e3460..9e339fa 100644
--- a/src/2/ppt-mkpkgs
+++ b/src/2/ppt-mkpkgs
@@ -123,7 +123,8 @@ main()
make_base_pkg
make_build_time_pkgs
make_run_time_pkgs
- info 'Consider adding "opkbuild (>= 4.2.0)" to Build-Depends'
+ info 'Consider adding "opkbuild (>= 4.2.1-3)" to Build-Depends if '$(: \
+ )'not already done'
if ${MAKE_SUBSTVARS}; then
info 'Stub "substvars" file generated. Set variables as '$(: \
)'needed.'
diff --git a/src/3/ppt-mkpkgs b/src/3/ppt-mkpkgs
index 518e1e3..f785358 100644
--- a/src/3/ppt-mkpkgs
+++ b/src/3/ppt-mkpkgs
@@ -125,7 +125,8 @@ main()
make_base_pkg
make_build_time_pkgs
make_run_time_pkgs
- info 'Consider adding "opkbuild (>= 4.2.0)" to Build-Depends'
+ info 'Consider adding "opkbuild (>= 4.2.1-3)" to Build-Depends if '$(: \
+ )'not already done'
if ${MAKE_SUBSTVARS}; then
info 'Stub "substvars" file generated. Set variables as '$(: \
)'needed.'
diff --git a/src/ppt-make b/src/ppt-make
index 234c17d..196849c 100644
--- a/src/ppt-make
+++ b/src/ppt-make
@@ -40,7 +40,7 @@ main()
cat >control <<-EOF
Maintainer: ${MAINTAINER_NAME} ${MAINTAINER_MAILBOX}
Build-Depends:
- opkbuild (>= 4.2.0),
+ opkbuild (>= 4.2.1-3),
platconf-pkg-tools (>= ${PPT_VERSION%.*}),
EOF