Skip to contentSkip to conversation

mention nconfig

PATCH New Shawn Landden 4 participants 11 messages Dec 9, 2013 – Mar 3, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 mention nconfig

---
 docs/manual/common-usage.txt |  2 +-
 docs/manual/using.txt        | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
docs/manual/common-usage.txt +1 -1
index c7f511a..1290dfc 100644
@@ -11,7 +11,7 @@ Offline builds
 
 If you intend to do an offline build and just want to download
 all sources that you previously selected in the configurator
-('menuconfig', 'xconfig' or 'gconfig'), then issue:
+('menuconfig', 'nconfig', 'xconfig' or 'gconfig'), then issue:
 
 --------------------
  $ make source
docs/manual/using.txt +8 -2
index de29ad6..9b0a81f 100644
@@ -15,7 +15,13 @@ assistant:
  $ make menuconfig
 --------------------
 
-to run the curses-based configurator, or
+or
+
+--------------------
+ $ make nconfig
+--------------------
+
+to run the old or new curses-based configurator, or
 
 --------------------
  $ make xconfig
@@ -105,7 +111,7 @@ This directory contains several subdirectories:
 * +toolchain/+ contains the build directories for the various
   components of the cross-compilation toolchain.
 
-These commands, +make menuconfig|gconfig|xconfig+ and +make+, are the
+These commands, +make menuconfig|nconfig|gconfig|xconfig+ and +make+, are the
 basic ones that allow to easily and quickly generate images fitting
 your needs, with all the supports and applications you enabled.
 
Signature · 1 line
1.8.5.1
#1 lore raw

PATCH 2/4 util-linux: nsenter

---
 package/util-linux/Config.in     | 5 +++++
 package/util-linux/util-linux.mk | 1 +
 2 files changed, 6 insertions(+)
package/util-linux/Config.in +5 -0
index 8c8fd7a..c8d31ac 100644
@@ -106,6 +106,11 @@ config BR2_PACKAGE_UTIL_LINUX_MOUNT
 	help
 	  Mount/unmount filesystems
 
+config BR2_PACKAGE_UTIL_LINUX_NSENTER
+        bool "nsenter"
+        help
+          Enter namespaces (setns(2) frontend)
+
 config BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT
 	bool "pivot_root"
 	help
package/util-linux/util-linux.mk +1 -0
index 20b3d35..af9d7c8 100644
@@ -62,6 +62,7 @@ UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-last --enable-login --enable-su --enable-sulogin,--disable-last --disable-login --disable-su --disable-sulogin) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_MOUNT),--enable-mount,--disable-mount) \
+        $(if $(BR2_PACKAGE_UTIL_LINUX_NSENTER),--enable-nsenter,--disable-nsenter) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),,--disable-partx) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT),--enable-pivot_root,--disable-pivot_root) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw,--disable-raw) \
Signature · 1 line
1.8.5.1
#2 lore raw

PATCH 2/4 util-linux: nsenter

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Shawn" == Shawn Landden <[email protected]> writes:

The commit message could have been a bit longer, but OK.

Quoted 12 lines
---
 package/util-linux/Config.in     | 5 +++++
 package/util-linux/util-linux.mk | 1 +
 2 files changed, 6 insertions(+)
package/util-linux/Config.in +0 -0
index 8c8fd7a..c8d31ac 100644

package/util-linux/Config.in config BR2_PACKAGE_UTIL_LINUX_MOUNT · line 113

Quoted 8 lines
package/util-linux/Config.in +5 -0
@@ -106,6 +106,11 @@ config BR2_PACKAGE_UTIL_LINUX_MOUNT
 	help
 	  Mount/unmount filesystems
 
+config BR2_PACKAGE_UTIL_LINUX_NSENTER
+        bool "nsenter"
+        help
+          Enter namespaces (setns(2) frontend)
+

Config.in indentation should be with <tab> (and the help lines <tab><space><space>)

package/util-linux/util-linux.mk UTIL_LINUX_CONF_OPT += \ · line 65

Quoted 12 lines
package/util-linux/Config.in +0 -0
 config BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT
 	bool "pivot_root"
 	help
package/util-linux/util-linux.mk +1 -0
index 20b3d35..af9d7c8 100644
@@ -62,6 +62,7 @@ UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-last --enable-login --enable-su --enable-sulogin,--disable-last --disable-login --disable-su --disable-sulogin) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_MOUNT),--enable-mount,--disable-mount) \
+        $(if $(BR2_PACKAGE_UTIL_LINUX_NSENTER),--enable-nsenter,--disable-nsenter) \

Same here, the other lines around it use <tab>.

Committed with those fixes, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 3/4 systemd does not require glib

In reply to Shawn Landden
---
 docs/manual/configure.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
docs/manual/configure.txt +1 -1
index 8912a81..89df3d9 100644
@@ -371,7 +371,7 @@ can be chosen from +System configuration+, +Init system+:
    etc. +systemd+ will be useful on relatively complex embedded
    systems, for example the ones requiring D-Bus and services
    communicating between each other. It is worth noting that +systemd+
-   brings a fairly big number of large dependencies: +dbus+, +glib+
+   brings a fairly big number of large dependencies: +dbus+, +udev+
    and more. For more details about +systemd+, see
    http://www.freedesktop.org/wiki/Software/systemd.
 
Signature · 1 line
1.8.5.1
#4 lore raw

PATCH 3/4 systemd does not require glib

Quoted 10 lines · Shawn Landden
---
 docs/manual/configure.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
docs/manual/configure.txt +0 -0
index 8912a81..89df3d9 100644

docs/manual/configure.txt can be chosen from +System configuration+, +Init system+: · line 376

Quoted 7 lines
docs/manual/configure.txt +1 -1
@@ -371,7 +371,7 @@ can be chosen from +System configuration+, +Init system+:
    etc. +systemd+ will be useful on relatively complex embedded
    systems, for example the ones requiring D-Bus and services
    communicating between each other. It is worth noting that +systemd+
-   brings a fairly big number of large dependencies: +dbus+, +glib+
+   brings a fairly big number of large dependencies: +dbus+, +udev+
    and more. For more details about +systemd+, see
    http://www.freedesktop.org/wiki/Software/systemd.
#6 lore raw

PATCH 4/4 systemd: uclibc now has posix_fallocate()

In reply to Shawn Landden

uClibc commit 5643900913f64c00f1c29589145

---
 package/systemd/systemd-uclibc-fix.patch | 18 ------------------
 1 file changed, 18 deletions(-)
package/systemd/systemd-uclibc-fix.patch +0 -18
index 9a20845..08a5d3d 100644
@@ -39,21 +39,3 @@ Index: systemd-44/src/macro.h
  #define _printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
  #define _sentinel_ __attribute__ ((sentinel))
  #define _noreturn_ __attribute__((noreturn))
-Index: systemd-44/src/journal/journal-file.c
-===================================================================
---- systemd-44.orig/src/journal/journal-file.c
-+++ systemd-44/src/journal/journal-file.c
-@@ -229,11 +229,13 @@
-                 }
-         }
- 
-+#ifndef __UCLIBC__
-         /* Note that the glibc fallocate() fallback is very
-            inefficient, hence we try to minimize the allocation area
-            as we can. */
-         if (posix_fallocate(f->fd, old_size, new_size - old_size) < 0)
-                 return -errno;
-+#endif
- 
-         if (fstat(f->fd, &f->last_stat) < 0)
-                 return -errno;
Signature · 1 line
1.8.5.1
#7 lore raw

PATCH 4/4 systemd: uclibc now has posix_fallocate()

Hi,

Quoted 24 lines · Shawn Landden

uClibc commit 5643900913f64c00f1c29589145

---
 package/systemd/systemd-uclibc-fix.patch | 18 ------------------
 1 file changed, 18 deletions(-)
package/systemd/systemd-uclibc-fix.patch +0 -9
index 9a20845..08a5d3d 100644
@@ -39,21 +39,3 @@ Index: systemd-44/src/macro.h
  #define _printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
  #define _sentinel_ __attribute__ ((sentinel))
  #define _noreturn_ __attribute__((noreturn))
-Index: systemd-44/src/journal/journal-file.c
-===================================================================
---- systemd-44.orig/src/journal/journal-file.c
-+++ systemd-44/src/journal/journal-file.c
-@@ -229,11 +229,13 @@
-                 }
-         }
-
-+#ifndef __UCLIBC__

package/systemd/systemd-uclibc-fix.patch Index: systemd-44/src/macro.h

Quoted 10 lines
package/systemd/systemd-uclibc-fix.patch +0 -10
-         /* Note that the glibc fallocate() fallback is very
-            inefficient, hence we try to minimize the allocation area
-            as we can. */
-         if (posix_fallocate(f->fd, old_size, new_size - old_size) < 0)
-                 return -errno;
-+#endif
-
-         if (fstat(f->fd, &f->last_stat) < 0)
-                 return -errno;
--

This clearly requires a toolchain with a sufficiently recent uClibc. I'm not familiar with our strategy here, so I'm adding ThomasP to this thread...

Best regards,
Thomas

#8 lore raw

PATCH 4/4 systemd: uclibc now has posix_fallocate()

Thomas, Shawn,

Quoted 3 lines · Thomas De Schampheleire

This clearly requires a toolchain with a sufficiently recent uClibc. I'm not familiar with our strategy here, so I'm adding ThomasP to this thread...

My current strategy is to finish reviewing the eudev/systemd patches from Eric, and get them merged. They upgrade systemd, and make it depend on glibc, since it uses many glibc-isms.

If people are unhappy with systemd being only available on uclibc systems, then they should either:

1/ Improve uClibc so that it provides the necessary glibc-isms, and make sure that the uClibc project is sufficiently alive to provide releases at a decent frequency (which it has failed to do for the last few years). I personally consider the uClibc project as mostly dead, and the best thing I'm wishing for this project is that a fork is made, with a more active and reactive community.

2/ Convince systemd upstream to not use the problematic glibc-isms, but I wish them good luck, knowing how upstream considers any system that isn't Linux/glibc.

3/ Realize that when you use systemd, you are already using heavy and fat dependencies (think D-Bus and Glib), and that therefore you can just as well afford the size of glibc.

In the mean time, if people want to fix systemd 44, then uClibc compatibility patches should not be *removed* but instead *improved*. For example, this posix_fallocate() patch should be replaced by a test in configure.ac, that tests whether the C library does or does not provide posix_fallocate(), and acts accordingly. That's the good way of fixing the problem, because it would support both uClibc toolchains that use official uClibc releases (and therefore don't provide posix_fallocate()) and uClibc toolchains generated by Buildroot (that provide posix_fallocate()).

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#9 lore raw

PATCH 4/4 systemd: uclibc now has posix_fallocate()

In reply to Shawn Landden

Dear Shawn Landden,

Quoted 6 lines · Shawn Landden

uClibc commit 5643900913f64c00f1c29589145

---
 package/systemd/systemd-uclibc-fix.patch | 18 ------------------
 1 file changed, 18 deletions(-)

Thanks, but we have now bumped systemd to version 207, and this new version caused too much problems with uClibc, so we've made it depend on (e)glibc. As a consequence, your patch is no longer necessary.

Do not hesitate to let us know if the new systemd version works for you.

Thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com