diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch b/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch new file mode 100644 index 000000000..a0996d4d4 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch @@ -0,0 +1,26 @@ +Upstream-Status: Pending + +--- a/apt-pkg/deb/dpkgpm.cc ++++ b/apt-pkg/deb/dpkgpm.cc +@@ -42,6 +42,12 @@ + #include <apti18n.h> + /*}}}*/ + ++#ifdef USE_NLS ++#define _dpkg(x) dgettext("dpkg", x) ++#else ++#define _dpkg(x) x ++#endif ++ + using namespace std; + + namespace +@@ -1279,7 +1285,7 @@ void pkgDPkgPM::WriteApportReport(const + } + + // check if its not a follow up error +- const char *needle = dgettext("dpkg", "dependency problems - leaving unconfigured"); ++ const char *needle = _dpkg("dependency problems - leaving unconfigured"); + if(strstr(errormsg, needle) != NULL) { + std::clog << _("No apport report written because the error message indicates its a followup error from a previous failure.") << std::endl; + return; |