diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 14:41:29 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 14:41:29 -0500 |
| commit | 21f9b84b4b729fbd7acbd465e7a3f726e4d20f91 (patch) | |
| tree | eb2d091d427ca0813b445509d59cc8e27e8ad25f /yocto-poky/meta/recipes-extended/sudo/sudo | |
| parent | 101cef31e2bf54c678501155cd2106251acbd076 (diff) | |
| parent | c124f4f2e04dca16a428a76c89677328bc7bf908 (diff) | |
| download | talos-openbmc-21f9b84b4b729fbd7acbd465e7a3f726e4d20f91.tar.gz talos-openbmc-21f9b84b4b729fbd7acbd465e7a3f726e4d20f91.zip | |
Merge commit 'c124f4f2e04dca16a428a76c89677328bc7bf908' as 'yocto-poky'
Diffstat (limited to 'yocto-poky/meta/recipes-extended/sudo/sudo')
2 files changed, 65 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch b/yocto-poky/meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch new file mode 100644 index 000000000..eb36cd49b --- /dev/null +++ b/yocto-poky/meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch @@ -0,0 +1,34 @@ +From 386e2c2fa2ab2e02ef71c268a57205139be329ab Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 31 Aug 2015 07:07:49 +0000 +Subject: [PATCH] Include sys/types.h for id_t definition + +/sudo_util.h:219:14: error: unknown type name 'id_t' + __dso_public id_t sudo_strtoid_v1(const char *str, const char *sep, + char **endp, const char **errstr); + ^ + make[1]: *** [preserve_fds.o] Error 1 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + include/sudo_util.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/sudo_util.h b/include/sudo_util.h +index 89c9f89..ac0855a 100644 +--- a/include/sudo_util.h ++++ b/include/sudo_util.h +@@ -17,6 +17,8 @@ + #ifndef SUDO_UTIL_H + #define SUDO_UTIL_H + ++#include <sys/types.h> ++ + #ifdef HAVE_STDBOOL_H + # include <stdbool.h> + #else +-- +2.5.1 + diff --git a/yocto-poky/meta/recipes-extended/sudo/sudo/0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch b/yocto-poky/meta/recipes-extended/sudo/sudo/0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch new file mode 100644 index 000000000..2418689da --- /dev/null +++ b/yocto-poky/meta/recipes-extended/sudo/sudo/0001-Use-correct-path-to-init.d-and-tmpfiles.d-files.patch @@ -0,0 +1,31 @@ +The makefile uses top_srcdir to find files that were created by configure, when +it should use top_builddir. + +Upstream-Status: Submitted (http://bugzilla.sudo.ws/show_bug.cgi?id=708) +Signed-off-by: Ross Burton <ross.burton@intel.com> + +--- + src/Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index f009e10..7acfb2d 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -165,11 +165,11 @@ install-dirs: + + install-rc: install-dirs + if [ -n "$(INIT_SCRIPT)" ]; then \ +- $(INSTALL) $(INSTALL_OWNER) -m 0755 $(top_srcdir)/init.d/$(INIT_SCRIPT) $(DESTDIR)$(INIT_DIR)/sudo; \ ++ $(INSTALL) $(INSTALL_OWNER) -m 0755 $(top_builddir)/init.d/$(INIT_SCRIPT) $(DESTDIR)$(INIT_DIR)/sudo; \ + rm -f $(DESTDIR)$(RC_LINK); \ + ln -s $(INIT_DIR)/sudo $(DESTDIR)$(RC_LINK); \ + elif test -n "$(tmpfiles_d)"; then \ +- $(INSTALL) $(INSTALL_OWNER) -m 0644 $(top_srcdir)/init.d/sudo.conf $(DESTDIR)$(tmpfiles_d)/sudo.conf; \ ++ $(INSTALL) $(INSTALL_OWNER) -m 0644 $(top_builddir)/init.d/sudo.conf $(DESTDIR)$(tmpfiles_d)/sudo.conf; \ + fi + + install-binaries: install-dirs $(PROGS) +-- +2.1.4 + |
