| Submitter | Khem Raj |
|---|---|
| Date | Aug. 24, 2012, 5:46 a.m. |
| Message ID | <1345787215-11917-1-git-send-email-raj.khem@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/35259/ |
| State | Superseded |
| Headers | show |
Comments
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Op 24-08-12 07:46, Khem Raj schreef: > Make sure that patches apply on top of latest systemd some source files > have moved around. > > Signed-off-by: Khem Raj <raj.khem@gmail.com> 2012-08-24 11:06:17 URL:http://patches.openembedded.org/patch/35259/mbox/ [2218] -> "pw-am-35259.patch" [1] Applying: systemd: Refresh the uclibc specific patches error: patch failed: meta-systemd/recipes-core/systemd/systemd_git.bb:32 error: meta-systemd/recipes-core/systemd/systemd_git.bb: patch does not apply Patch failed at 0001 systemd: Refresh the uclibc specific patches When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Darwin) Comment: GPGTools - http://gpgtools.org iD8DBQFQN0RrMkyGM64RGpERAkBhAJ4lPzPStp+i0zXlb94MLULzn1PK2wCeKlFP BnXF/w6qYbHzCN9rNy2ON8o= =dlGq -----END PGP SIGNATURE-----
Patch
diff --git a/meta-systemd/recipes-core/systemd/systemd/paper-over-mkostemp.patch b/meta-systemd/recipes-core/systemd/systemd/paper-over-mkostemp.patch index ca10440..ae4f6de 100644 --- a/meta-systemd/recipes-core/systemd/systemd/paper-over-mkostemp.patch +++ b/meta-systemd/recipes-core/systemd/systemd/paper-over-mkostemp.patch @@ -2,10 +2,10 @@ uclibc does not have mkostemp() so we redefine it to use mkstemp() Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: git/src/macro.h +Index: git/src/shared/macro.h =================================================================== ---- git.orig/src/macro.h 2011-06-30 10:33:53.000000000 -0700 -+++ git/src/macro.h 2011-06-30 15:07:28.285270006 -0700 +--- git.orig/src/shared/macro.h 2012-08-23 22:13:18.618931300 -0700 ++++ git/src/shared/macro.h 2012-08-23 22:15:05.558935366 -0700 @@ -27,6 +27,10 @@ #include <sys/uio.h> #include <inttypes.h> diff --git a/meta-systemd/recipes-core/systemd/systemd_git.bb b/meta-systemd/recipes-core/systemd/systemd_git.bb index eb66e59..5496512 100644 --- a/meta-systemd/recipes-core/systemd/systemd_git.bb +++ b/meta-systemd/recipes-core/systemd/systemd_git.bb @@ -32,6 +32,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \ file://touchscreen.rules \ file://modprobe.rules \ file://var-run.conf \ + ${UCLIBCPATCHES} \ " UCLIBCPATCHES = "" UCLIBCPATCHES_libc-uclibc = "file://paper-over-mkostemp.patch \
Make sure that patches apply on top of latest systemd some source files have moved around. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../systemd/systemd/paper-over-mkostemp.patch | 6 +++--- meta-systemd/recipes-core/systemd/systemd_git.bb | 1 + 2 files changed, 4 insertions(+), 3 deletions(-)