diff options
author | Ricardo Ribalda Delgado <ricardo@ribalda.com> | 2019-08-20 10:19:02 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-30 16:44:42 +0100 |
commit | add1a327cf56c6706d6c109740071b74bb75e037 (patch) | |
tree | 10d8517a932867e71480bd425d782e71ead011e3 /meta/recipes-devtools | |
parent | a110e1f58653fac65da234e63ca91584bf178b5e (diff) | |
download | poky-add1a327cf56c6706d6c109740071b74bb75e037.tar.gz |
dpkg: Use less as pager
Debian traditionaly uses /usr/bin/pager as the system pager, which is a
link to the user preferred pager. This is a Debianism.
Without this patch:
root@qt5122:~# dpkg -l
sh: pager: command not found
dpkg-query: error: showing package list on pager subprocess returned error exit status 127
(From OE-Core rev: 51fb10275cd9013e3c5fcb94f88e3529e2b8f069)
Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/pager.patch | 21 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg_1.19.4.bb | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/pager.patch b/meta/recipes-devtools/dpkg/dpkg/pager.patch new file mode 100644 index 0000000000..e56b9d28af --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg/pager.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | pager: Use less instead of pager | ||
2 | |||
3 | pager is a Debianism. Istead use directly pager. | ||
4 | |||
5 | Upstream-Status: Inappropriate [OE-Core integration specific] | ||
6 | |||
7 | Suggested-by: Burton, Ross <ross.burton@intel.com> | ||
8 | Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com> | ||
9 | diff --git a/lib/dpkg/dpkg.h b/lib/dpkg/dpkg.h | ||
10 | index 2bb067a..6cbce80 100644 | ||
11 | --- a/lib/dpkg/dpkg.h | ||
12 | +++ b/lib/dpkg/dpkg.h | ||
13 | @@ -95,7 +95,7 @@ DPKG_BEGIN_DECLS | ||
14 | #define MAXUPDATES 250 | ||
15 | |||
16 | #define DEFAULTSHELL "sh" | ||
17 | -#define DEFAULTPAGER "pager" | ||
18 | +#define DEFAULTPAGER "less" | ||
19 | |||
20 | #define MD5HASHLEN 32 | ||
21 | #define MAXTRIGDIRECTIVE 256 | ||
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.19.4.bb b/meta/recipes-devtools/dpkg/dpkg_1.19.4.bb index c3dbda77a4..e6083e2219 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.19.4.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.19.4.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz \ | |||
13 | file://0006-add-musleabi-to-known-target-tripets.patch \ | 13 | file://0006-add-musleabi-to-known-target-tripets.patch \ |
14 | file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ | 14 | file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ |
15 | file://0001-dpkg-Support-muslx32-build.patch \ | 15 | file://0001-dpkg-Support-muslx32-build.patch \ |
16 | file://pager.patch \ | ||
16 | " | 17 | " |
17 | SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch \ | 18 | SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch \ |
18 | file://tweak-options-require-tar-1.27.patch \ | 19 | file://tweak-options-require-tar-1.27.patch \ |