Message ID | 20200822105703.422356-2-colin.king@canonical.com |
---|---|
State | Accepted |
Headers | show |
Series | [1/2,V2] Replace json-c library with minimal replacement | expand |
On 2020-08-22 4:57 a.m., Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > We no longer need to use json libraries, so remove dependencies > and references to the library in README files > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > > V2: No change, just 2nd patch of resend > > --- > README | 10 +++++----- > debian/control | 1 - > snapcraft.yaml | 1 - > 3 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/README b/README > index a08a2a7f..40a0eb75 100644 > --- a/README > +++ b/README > @@ -7,22 +7,22 @@ Quick Start Guide > 1) Dependencies: > > Ubuntu Distro x86_64 > - autoconf automake libglib2.0-dev libtool libpcre3-dev libjson0-dev > - libjson-c-dev flex bison dkms libfdt-dev libbsd-dev > + autoconf automake libglib2.0-dev libtool libpcre3-dev > + flex bison dkms libfdt-dev libbsd-dev > > Ubuntu Distro ppc64el > - autoconf automake libglib2.0-dev libtool libpcre3-dev libjson-c-dev > + autoconf automake libglib2.0-dev libtool libpcre3-dev > flex bison dkms libfdt-dev device-tree-compiler libpci-dev libbsd-dev > > RHEL Distro ppc64el > autoconf automake kernel-devel libtool flex flex-devel bison dkms > - libfdt libfdt-devel dtc json-c json-c-devel pcre-devel pcre2 pcre2-devel > + libfdt libfdt-devel dtc pcre-devel pcre2 pcre2-devel > pcre2-utf16 pcre2-utf32 glib2 glib2-devel pciutils pciutils-devel zlib-devel > make libbsd-devel > > Ubuntu Distro ARM64 > autoconf automake libglib2.0-dev libtool libpcre3-dev > - libjson-c-dev flex bison dkms libfdt-dev libbsd-dev > + flex bison dkms libfdt-dev libbsd-dev > > 2) To build and install (only if building from source) > > diff --git a/debian/control b/debian/control > index e4fe0412..fda94c47 100644 > --- a/debian/control > +++ b/debian/control > @@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 9~), > autoconf, > automake, > libtool, > - libjson0-dev | libjson-c-dev (>= 0.9), > flex, > bison, > dh-autoreconf, > diff --git a/snapcraft.yaml b/snapcraft.yaml > index ac3d3794..bebb8d3e 100644 > --- a/snapcraft.yaml > +++ b/snapcraft.yaml > @@ -20,7 +20,6 @@ parts: > - autoconf > - automake > - libtool > - - libjson-c-dev > - flex > - bison > - dh-autoreconf > Acked-by: Alex Hung <alex.hung@canonical.com>
On 8/22/20 6:57 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > We no longer need to use json libraries, so remove dependencies > and references to the library in README files > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > > V2: No change, just 2nd patch of resend > > --- > README | 10 +++++----- > debian/control | 1 - > snapcraft.yaml | 1 - > 3 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/README b/README > index a08a2a7f..40a0eb75 100644 > --- a/README > +++ b/README > @@ -7,22 +7,22 @@ Quick Start Guide > 1) Dependencies: > > Ubuntu Distro x86_64 > - autoconf automake libglib2.0-dev libtool libpcre3-dev libjson0-dev > - libjson-c-dev flex bison dkms libfdt-dev libbsd-dev > + autoconf automake libglib2.0-dev libtool libpcre3-dev > + flex bison dkms libfdt-dev libbsd-dev > > Ubuntu Distro ppc64el > - autoconf automake libglib2.0-dev libtool libpcre3-dev libjson-c-dev > + autoconf automake libglib2.0-dev libtool libpcre3-dev > flex bison dkms libfdt-dev device-tree-compiler libpci-dev libbsd-dev > > RHEL Distro ppc64el > autoconf automake kernel-devel libtool flex flex-devel bison dkms > - libfdt libfdt-devel dtc json-c json-c-devel pcre-devel pcre2 pcre2-devel > + libfdt libfdt-devel dtc pcre-devel pcre2 pcre2-devel > pcre2-utf16 pcre2-utf32 glib2 glib2-devel pciutils pciutils-devel zlib-devel > make libbsd-devel > > Ubuntu Distro ARM64 > autoconf automake libglib2.0-dev libtool libpcre3-dev > - libjson-c-dev flex bison dkms libfdt-dev libbsd-dev > + flex bison dkms libfdt-dev libbsd-dev > > 2) To build and install (only if building from source) > > diff --git a/debian/control b/debian/control > index e4fe0412..fda94c47 100644 > --- a/debian/control > +++ b/debian/control > @@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 9~), > autoconf, > automake, > libtool, > - libjson0-dev | libjson-c-dev (>= 0.9), > flex, > bison, > dh-autoreconf, > diff --git a/snapcraft.yaml b/snapcraft.yaml > index ac3d3794..bebb8d3e 100644 > --- a/snapcraft.yaml > +++ b/snapcraft.yaml > @@ -20,7 +20,6 @@ parts: > - autoconf > - automake > - libtool > - - libjson-c-dev > - flex > - bison > - dh-autoreconf > Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff --git a/README b/README index a08a2a7f..40a0eb75 100644 --- a/README +++ b/README @@ -7,22 +7,22 @@ Quick Start Guide 1) Dependencies: Ubuntu Distro x86_64 - autoconf automake libglib2.0-dev libtool libpcre3-dev libjson0-dev - libjson-c-dev flex bison dkms libfdt-dev libbsd-dev + autoconf automake libglib2.0-dev libtool libpcre3-dev + flex bison dkms libfdt-dev libbsd-dev Ubuntu Distro ppc64el - autoconf automake libglib2.0-dev libtool libpcre3-dev libjson-c-dev + autoconf automake libglib2.0-dev libtool libpcre3-dev flex bison dkms libfdt-dev device-tree-compiler libpci-dev libbsd-dev RHEL Distro ppc64el autoconf automake kernel-devel libtool flex flex-devel bison dkms - libfdt libfdt-devel dtc json-c json-c-devel pcre-devel pcre2 pcre2-devel + libfdt libfdt-devel dtc pcre-devel pcre2 pcre2-devel pcre2-utf16 pcre2-utf32 glib2 glib2-devel pciutils pciutils-devel zlib-devel make libbsd-devel Ubuntu Distro ARM64 autoconf automake libglib2.0-dev libtool libpcre3-dev - libjson-c-dev flex bison dkms libfdt-dev libbsd-dev + flex bison dkms libfdt-dev libbsd-dev 2) To build and install (only if building from source) diff --git a/debian/control b/debian/control index e4fe0412..fda94c47 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 9~), autoconf, automake, libtool, - libjson0-dev | libjson-c-dev (>= 0.9), flex, bison, dh-autoreconf, diff --git a/snapcraft.yaml b/snapcraft.yaml index ac3d3794..bebb8d3e 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -20,7 +20,6 @@ parts: - autoconf - automake - libtool - - libjson-c-dev - flex - bison - dh-autoreconf