Skip to contentSkip to conversation

systemd_git.bb: Alias mkostemp() to mkstemp() for uclibc targets

PATCH In review Khem Raj 4 participants 8 messages Jul 1, 2011

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 systemd_git.bb: Alias mkostemp() to mkstemp() for uclibc targets

---
 .../systemd/systemd/paper-over-mkostemp.patch      |   19 +++++++++++++++++++
 meta-oe/recipes-core/systemd/systemd_git.bb        |    3 ++-
 2 files changed, 21 insertions(+), 1 deletions(-)
 create mode 100644 meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch
meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch new file +19 -0
new file mode 100644
index 0000000..ca10440
@@ -0,0 +1,19 @@
+uclibc does not have mkostemp() so we redefine it to use mkstemp()
+
+Signed-off-by: Khem Raj <[email protected]>
+
+Index: git/src/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
+@@ -27,6 +27,10 @@
+ #include <sys/uio.h>
+ #include <inttypes.h>
+ 
++#ifdef __UCLIBC__
++/* uclibc does not implement mkostemp GNU extention */
++#define mkostemp(x,y) mkstemp(x)
++#endif
+ #define _printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
+ #define _sentinel_ __attribute__ ((sentinel))
+ #define _noreturn_ __attribute__((noreturn))
meta-oe/recipes-core/systemd/systemd_git.bb +2 -1
index 2a313e0..c750b2f 100644
@@ -15,7 +15,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r3"
+PR = "r4"
 
 inherit autotools vala
 
@@ -23,6 +23,7 @@ SRCREV = "8585357a0e5e9f4d56e999d7cd1a73e77ae0eb80"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \
            file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
+           file://paper-over-mkostemp.patch \
           "
 
 S = "${WORKDIR}/git"
Signature · 1 line
1.7.4.1
#1 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Thanks, both are in

Quoted 46 lines · Khem Raj
---
 .../systemd/systemd/paper-over-mkostemp.patch      |   19 +++++++++++++++++++
 meta-oe/recipes-core/systemd/systemd_git.bb        |    3 ++-
 2 files changed, 21 insertions(+), 1 deletions(-)
 create mode 100644 meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch
meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch new file +19 -0
new file mode 100644
index 0000000..ca10440
@@ -0,0 +1,19 @@
+uclibc does not have mkostemp() so we redefine it to use mkstemp()
+
+Signed-off-by: Khem Raj <[email protected]>
+
+Index: git/src/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
+@@ -27,6 +27,10 @@
+ #include <sys/uio.h>
+ #include <inttypes.h>
+ 
++#ifdef __UCLIBC__
++/* uclibc does not implement mkostemp GNU extention */
++#define mkostemp(x,y) mkstemp(x)
++#endif
+ #define _printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
+ #define _sentinel_ __attribute__ ((sentinel))
+ #define _noreturn_ __attribute__((noreturn))
meta-oe/recipes-core/systemd/systemd_git.bb +1 -1
index 2a313e0..c750b2f 100644
@@ -15,7 +15,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r3"
+PR = "r4"
 
 inherit autotools vala
 

meta-oe/recipes-core/systemd/systemd_git.bb SRCREV = "8585357a0e5e9f4d56e999d7cd1a73e77ae0eb80" · line 29

Quoted 7 lines
meta-oe/recipes-core/systemd/systemd_git.bb +1 -0
@@ -23,6 +23,7 @@ SRCREV = "8585357a0e5e9f4d56e999d7cd1a73e77ae0eb80"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \
            file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
+           file://paper-over-mkostemp.patch \
           "
 
 S = "${WORKDIR}/git"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFODXCyMkyGM64RGpERAs2xAJkBX+3ccJsW4y9osQSYFq5shzC2LACfe6IX RN9FH3u/dVImKyDh794PCfg=
=SyuQ
-----END PGP SIGNATURE-----

#2 lore raw
In reply to Khem Raj

Am Donnerstag, den 30.06.2011, 22:38 -0700 schrieb Khem Raj:

As far as I know the bb extension should be omitted in the commit summary?

Quoted 1 line

Does systemd build for you with this patch and uClibc?

Quoted 12 lines
---
 .../systemd/systemd/paper-over-mkostemp.patch      |   19 +++++++++++++++++++
 meta-oe/recipes-core/systemd/systemd_git.bb        |    3 ++-
 2 files changed, 21 insertions(+), 1 deletions(-)
 create mode 100644 meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch
meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch new file +0 -0
new file mode 100644
index 0000000..ca10440

meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch line 3

Quoted 3 lines
meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch new file +3 -0
@@ -0,0 +1,19 @@
+uclibc does not have mkostemp() so we redefine it to use mkstemp()
+
+Signed-off-by: Khem Raj <[email protected]>

Is that patch for upstream inclusion?

[…]

Thanks,

Paul

[1] http://openembedded.org/index.php/Commit_Patch_Message_Guidelines

author
#3 lore raw
Quoted 8 lines · Paul Menzel

Am Donnerstag, den 30.06.2011, 22:38 -0700 schrieb Khem Raj:

As far as I know the bb extension should be omitted in the commit summary?

Quoted 1 line

Does systemd build for you with this patch and uClibc?

ofcourse

Quoted 7 lines
Quoted 7 lines
---
  .../systemd/systemd/paper-over-mkostemp.patch      |   19 +++++++++++++++++++
  meta-oe/recipes-core/systemd/systemd_git.bb        |    3 ++-
  2 files changed, 21 insertions(+), 1 deletions(-)

create mode 100644 meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch

Quoted 11 lines

meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch line 3

Quoted 9 lines
meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch new file +3 -0
new file mode 100644
index 0000000..ca10440
@@ -0,0 +1,19 @@
+uclibc does not have mkostemp() so we redefine it to use mkstemp()
+
+Signed-off-by: Khem Raj<[email protected]>

Is that patch for upstream inclusion?

not yet

Quoted 17 lines

[…]

Thanks,

Paul

[1] http://openembedded.org/index.php/Commit_Patch_Message_Guidelines

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#4 lore raw
In reply to Khem Raj
Quoted 4 lines · Khem Raj

++#ifdef __UCLIBC__
++/* uclibc does not implement mkostemp GNU extention */ ++#define mkostemp(x,y) mkstemp(x)
++#endif

Is that safe? It would be nice to have some commentary in the patch explaining why the flags are not required for systemd to operate correctly. If it genuinely doesn't need to be using mkostemp() then perhaps this change should just be made upstream for all libcs.

p.

author
#5 lore raw
Quoted 11 lines · Phil Blundell
Quoted 4 lines · Khem Raj

++#ifdef __UCLIBC__
++/* uclibc does not implement mkostemp GNU extention */ ++#define mkostemp(x,y) mkstemp(x)
++#endif

Is that safe? It would be nice to have some commentary in the patch explaining why the flags are not required for systemd to operate correctly. If it genuinely doesn't need to be using mkostemp() then perhaps this change should just be made upstream for all libcs.

right
I have to test it eglibc systems

Quoted 9 lines

p.

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#6 lore raw
Quoted 9 lines · Khem Raj
Quoted 6 lines · Phil Blundell
Quoted 4 lines · Khem Raj

++#ifdef __UCLIBC__
++/* uclibc does not implement mkostemp GNU extention */ ++#define mkostemp(x,y) mkstemp(x)
++#endif

Quoted 7 lines
Quoted 5 lines

Is that safe? It would be nice to have some commentary in the patch explaining why the flags are not required for systemd to operate correctly. If it genuinely doesn't need to be using mkostemp() then perhaps this change should just be made upstream for all libcs.

right
I have to test it eglibc systems

I'm not sure that's quite the point. What I was trying to say before was that, if systemd is going to the trouble of using mkostemp() rather than mkstemp() in the first place, one would normally assume that it is expecting that extra argument to be respected. So it seems like there are two possibilities:

a) the standardised semantics of mkstemp() are actually sufficient for systemd's requirements and there was no need for it to be using mkostemp() at all. In this case it should just be patched (ideally upstream) to use mkstemp() unconditionally.

b) the specific semantics of uClibc's mkstemp() implementation are sufficient for systemd's needs, although the semantics guaranteed by the standards are not. In this case your patch might be appropriate but there should be a comment explaining why it is safe and what exactly the uClibc behaviour is that it depends on. This would still not be an ideal state of affairs since uClibc might change in the future, but it's probably acceptable; a better solution might be either to add mkostemp() into uClibc explicitly, or to patch systemd to obtain the semantics that it needs by some other route.

I'm not familiar enough with either systemd or uClibc to know which of the above is true here. Can you clarify?

p.

author
#7 lore raw
Quoted 24 lines · Phil Blundell
Quoted 9 lines · Khem Raj
Quoted 6 lines · Phil Blundell
Quoted 4 lines · Khem Raj

++#ifdef __UCLIBC__
++/* uclibc does not implement mkostemp GNU extention */ ++#define mkostemp(x,y) mkstemp(x)
++#endif

Quoted 7 lines
Quoted 5 lines

Is that safe? It would be nice to have some commentary in the patch explaining why the flags are not required for systemd to operate correctly. If it genuinely doesn't need to be using mkostemp() then perhaps this change should just be made upstream for all libcs.

right
I have to test it eglibc systems

I'm not sure that's quite the point. What I was trying to say before was that, if systemd is going to the trouble of using mkostemp() rather than mkstemp() in the first place, one would normally assume that it is expecting that extra argument to be respected. So it seems like there are two possibilities:

Quoted 4 lines

a) the standardised semantics of mkstemp() are actually sufficient for systemd's requirements and there was no need for it to be using mkostemp() at all. In this case it should just be patched (ideally upstream) to use mkstemp() unconditionally.

yes I was using a mobile device did not type too much but this is the case I am inclined to test.

Quoted 10 lines

b) the specific semantics of uClibc's mkstemp() implementation are sufficient for systemd's needs, although the semantics guaranteed by the standards are not. In this case your patch might be appropriate but there should be a comment explaining why it is safe and what exactly the uClibc behaviour is that it depends on. This would still not be an ideal state of affairs since uClibc might change in the future, but it's probably acceptable; a better solution might be either to add mkostemp() into uClibc explicitly, or to patch systemd to obtain the semantics that it needs by some other route.

no if the flags are needed then uclibc's mkstemp wont work. We have to provide an implementation of mkostemp or alter the code in systemd so it uses something else. But this is second choice. Since uclibc does not like the extentions to be implemented.

Quoted 11 lines

I'm not familiar enough with either systemd or uClibc to know which of the above is true here. Can you clarify?

p.

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel