From 7f801af6493116cd1b51506f02f33b00fabba3f5 Mon Sep 17 00:00:00 2001 From: SamirPS Date: Fri, 2 Feb 2024 15:13:16 +0100 Subject: [PATCH 1/3] feat(24.04): Add JQ slices This PR add the libs and the jq slices for noble Signed_Off_By: Samir Akarioh --- slices/jq.yaml | 9 +++++++++ slices/libjq1.yaml | 9 +++++++++ slices/libonig5.yaml | 8 ++++++++ 3 files changed, 26 insertions(+) create mode 100644 slices/jq.yaml create mode 100644 slices/libjq1.yaml create mode 100644 slices/libonig5.yaml diff --git a/slices/jq.yaml b/slices/jq.yaml new file mode 100644 index 000000000..d822b1865 --- /dev/null +++ b/slices/jq.yaml @@ -0,0 +1,9 @@ +package: jq + +slices: + bins: + essential: + - libc6_libs + - libjq1_libs + contents: + /usr/bin/jq: diff --git a/slices/libjq1.yaml b/slices/libjq1.yaml new file mode 100644 index 000000000..fa15819e8 --- /dev/null +++ b/slices/libjq1.yaml @@ -0,0 +1,9 @@ +package: libjq1 + +slices: + libs: + essential: + - libc6_libs + - libonig5_libs + contents: + /usr/lib/*-linux-*/libjq.so.**: diff --git a/slices/libonig5.yaml b/slices/libonig5.yaml new file mode 100644 index 000000000..3ced49747 --- /dev/null +++ b/slices/libonig5.yaml @@ -0,0 +1,8 @@ +package: libonig5 + +slices: + libs: + essential: + - libc6_libs + contents: + /usr/lib/*-linux-*/libonig.so.**: From a3d93bcbfaaca4664ee4d0ac99e57ab721a60b42 Mon Sep 17 00:00:00 2001 From: SamirPS Date: Fri, 15 Mar 2024 14:11:57 +0100 Subject: [PATCH 2/3] Fix the path for slice --- slices/libjq1.yaml | 2 +- slices/libonig5.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/slices/libjq1.yaml b/slices/libjq1.yaml index fa15819e8..09a2ce4b1 100644 --- a/slices/libjq1.yaml +++ b/slices/libjq1.yaml @@ -6,4 +6,4 @@ slices: - libc6_libs - libonig5_libs contents: - /usr/lib/*-linux-*/libjq.so.**: + /usr/lib/*-linux-*/libjq.so.1*: diff --git a/slices/libonig5.yaml b/slices/libonig5.yaml index 3ced49747..59a16db41 100644 --- a/slices/libonig5.yaml +++ b/slices/libonig5.yaml @@ -5,4 +5,4 @@ slices: essential: - libc6_libs contents: - /usr/lib/*-linux-*/libonig.so.**: + /usr/lib/*-linux-*/libonig.so.5*: From 4f92f326c4fc77401d2af498c1e3ca2a1587fc3c Mon Sep 17 00:00:00 2001 From: Alberto Carretero Date: Thu, 16 May 2024 10:12:41 +0200 Subject: [PATCH 3/3] add copyright explicitly and package essential --- slices/jq.yaml | 6 ++++++ slices/libjq1.yaml | 6 ++++++ slices/libonig5.yaml | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/slices/jq.yaml b/slices/jq.yaml index d822b1865..7641b80f6 100644 --- a/slices/jq.yaml +++ b/slices/jq.yaml @@ -1,5 +1,8 @@ package: jq +essential: + - jq_copyright + slices: bins: essential: @@ -7,3 +10,6 @@ slices: - libjq1_libs contents: /usr/bin/jq: + copyright: + contents: + /usr/share/doc/jq/copyright: diff --git a/slices/libjq1.yaml b/slices/libjq1.yaml index 09a2ce4b1..598e8a7f7 100644 --- a/slices/libjq1.yaml +++ b/slices/libjq1.yaml @@ -1,5 +1,8 @@ package: libjq1 +essential: + - libjq1_copyright + slices: libs: essential: @@ -7,3 +10,6 @@ slices: - libonig5_libs contents: /usr/lib/*-linux-*/libjq.so.1*: + copyright: + contents: + /usr/share/doc/libjq1/copyright: diff --git a/slices/libonig5.yaml b/slices/libonig5.yaml index 59a16db41..6433c7c21 100644 --- a/slices/libonig5.yaml +++ b/slices/libonig5.yaml @@ -1,8 +1,14 @@ package: libonig5 +essential: + - libonig5_copyright + slices: libs: essential: - libc6_libs contents: /usr/lib/*-linux-*/libonig.so.5*: + copyright: + contents: + /usr/share/doc/libonig5/copyright: