| Message ID | 1646140075-39370-2-git-send-email-wangmy@fujitsu.com |
|---|---|
| State | Accepted, archived |
| Commit | 3f665656e3c0134994015235c24240086d5324fc |
| Headers | show |
| Series | sqlite3: upgrade 3.37.2 -> 3.38.0 | expand |
On Tue, 2022-03-01 at 21:07 +0800, wangmy wrote: > Remove invalid PACKAGECONFIG : json1 > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- > meta/recipes-support/sqlite/sqlite3.inc | 3 +-- > .../sqlite/{sqlite3_3.37.2.bb => sqlite3_3.38.0.bb} | 2 +- > 2 files changed, 2 insertions(+), 3 deletions(-) > rename meta/recipes-support/sqlite/{sqlite3_3.37.2.bb => sqlite3_3.38.0.bb} (86%) > > diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc > index aa5dc0974b..b89f509c12 100644 > --- a/meta/recipes-support/sqlite/sqlite3.inc > +++ b/meta/recipes-support/sqlite/sqlite3.inc > @@ -23,7 +23,7 @@ CVE_PRODUCT = "sqlite" > inherit autotools pkgconfig siteinfo > > # enable those which are enabled by default in configure > -PACKAGECONFIG ?= "fts4 fts5 json1 rtree dyn_ext" > +PACKAGECONFIG ?= "fts4 fts5 rtree dyn_ext" > PACKAGECONFIG:class-native ?= "fts4 fts5 json1 rtree dyn_ext" > > PACKAGECONFIG[editline] = "--enable-editline,--disable-editline,libedit" This triggers: WARNING: sqlite3-native-3_3.38.0-r0 do_configure: QA Issue: sqlite3-native: invalid PACKAGECONFIG: json1 [invalid-packageconfig] but I fixed the patch in master-next. Cheers, Richard
diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc index aa5dc0974b..b89f509c12 100644 --- a/meta/recipes-support/sqlite/sqlite3.inc +++ b/meta/recipes-support/sqlite/sqlite3.inc @@ -23,7 +23,7 @@ CVE_PRODUCT = "sqlite" inherit autotools pkgconfig siteinfo # enable those which are enabled by default in configure -PACKAGECONFIG ?= "fts4 fts5 json1 rtree dyn_ext" +PACKAGECONFIG ?= "fts4 fts5 rtree dyn_ext" PACKAGECONFIG:class-native ?= "fts4 fts5 json1 rtree dyn_ext" PACKAGECONFIG[editline] = "--enable-editline,--disable-editline,libedit" @@ -31,7 +31,6 @@ PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline ncurses PACKAGECONFIG[fts3] = "--enable-fts3,--disable-fts3" PACKAGECONFIG[fts4] = "--enable-fts4,--disable-fts4" PACKAGECONFIG[fts5] = "--enable-fts5,--disable-fts5" -PACKAGECONFIG[json1] = "--enable-json1,--disable-json1" PACKAGECONFIG[rtree] = "--enable-rtree,--disable-rtree" PACKAGECONFIG[session] = "--enable-session,--disable-session" PACKAGECONFIG[dyn_ext] = "--enable-dynamic-extensions,--disable-dynamic-extensions" diff --git a/meta/recipes-support/sqlite/sqlite3_3.37.2.bb b/meta/recipes-support/sqlite/sqlite3_3.38.0.bb similarity index 86% rename from meta/recipes-support/sqlite/sqlite3_3.37.2.bb rename to meta/recipes-support/sqlite/sqlite3_3.38.0.bb index eb684e0d14..a797679f12 100644 --- a/meta/recipes-support/sqlite/sqlite3_3.37.2.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.38.0.bb @@ -4,7 +4,7 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" SRC_URI = "http://www.sqlite.org/2022/sqlite-autoconf-${SQLITE_PV}.tar.gz" -SRC_URI[sha256sum] = "4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8" +SRC_URI[sha256sum] = "1c76e25dc63d9f3935e0f406aec520a33ee77cf54ea5147dffe1fae8369eff68" # -19242 is only an issue in specific development branch commits CVE_CHECK_IGNORE += "CVE-2019-19242"
Remove invalid PACKAGECONFIG : json1 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- meta/recipes-support/sqlite/sqlite3.inc | 3 +-- .../sqlite/{sqlite3_3.37.2.bb => sqlite3_3.38.0.bb} | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) rename meta/recipes-support/sqlite/{sqlite3_3.37.2.bb => sqlite3_3.38.0.bb} (86%)