* [Buildroot] [PATCH 2/3] busybox: add modprobe fix
2011-02-03 20:45 [Buildroot] [PATCH 1/3] openssl: fix libdir issue bug #3205 Gustavo Zacarias
@ 2011-02-03 20:45 ` Gustavo Zacarias
2011-02-04 18:50 ` Peter Korsgaard
2011-02-03 20:45 ` [Buildroot] [PATCH 3/3] ntp: add ntpdate option Gustavo Zacarias
1 sibling, 1 reply; 5+ messages in thread
From: Gustavo Zacarias @ 2011-02-03 20:45 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
.../busybox-1.18.2/busybox-1.18.2-modprobe.patch | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
create mode 100644 package/busybox/busybox-1.18.2/busybox-1.18.2-modprobe.patch
diff --git a/package/busybox/busybox-1.18.2/busybox-1.18.2-modprobe.patch b/package/busybox/busybox-1.18.2/busybox-1.18.2-modprobe.patch
new file mode 100644
index 0000000..cad887e
--- /dev/null
+++ b/package/busybox/busybox-1.18.2/busybox-1.18.2-modprobe.patch
@@ -0,0 +1,20 @@
+--- busybox-1.18.2/modutils/modutils.c
++++ busybox-1.18.2-modprobe/modutils/modutils.c
+@@ -71,12 +71,11 @@ char* FAST_FUNC parse_cmdline_module_opt
+ optlen = 0;
+ while (*++argv) {
+ options = xrealloc(options, optlen + 2 + strlen(*argv) + 2);
+- /* Older versions were enclosing space-containing *argv in "",
+- * but both modprobe and insmod from module-init-tools 3.11.1
+- * don't do this anymore. (As to extra trailing space,
+- * insmod adds it but modprobe does not. We do in both cases)
+- */
+- optlen += sprintf(options + optlen, "%s ", *argv);
++ /* Spaces handled by "" pairs, but no way of escaping quotes */
++//TODO: module-init-tools version 3.11.1 quotes only value:
++//it generates var="val with spaces", not "var=val with spaces"
++//(and it won't quote var *name* even if it has spaces)
++ optlen += sprintf(options + optlen, (strchr(*argv, ' ') ? "\"%s\" " : "%s "), *argv);
+ }
+ return options;
+ }
--
1.7.3.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 3/3] ntp: add ntpdate option
2011-02-03 20:45 [Buildroot] [PATCH 1/3] openssl: fix libdir issue bug #3205 Gustavo Zacarias
2011-02-03 20:45 ` [Buildroot] [PATCH 2/3] busybox: add modprobe fix Gustavo Zacarias
@ 2011-02-03 20:45 ` Gustavo Zacarias
2011-02-04 19:02 ` Peter Korsgaard
1 sibling, 1 reply; 5+ messages in thread
From: Gustavo Zacarias @ 2011-02-03 20:45 UTC (permalink / raw)
To: buildroot
Add ntpdate option bug #2935.
Based on incomplete patch by Frederik Pasch <fpasch@googlemail.com>
Also enable crypto when openssl is enabled.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/ntp/Config.in | 16 ++++++++++++++++
package/ntp/TODO | 33 ---------------------------------
package/ntp/ntp.mk | 13 ++++++++++---
3 files changed, 26 insertions(+), 36 deletions(-)
delete mode 100644 package/ntp/TODO
diff --git a/package/ntp/Config.in b/package/ntp/Config.in
index afbf0d5..1b2ab4b 100644
--- a/package/ntp/Config.in
+++ b/package/ntp/Config.in
@@ -27,6 +27,22 @@ config BR2_PACKAGE_NTP_NTP_WAIT
(synchronized). This could be useful at boot time, to delay the
boot sequence until after "ntpd -g" has set the time.
+config BR2_PACKAGE_NTP_NTPD
+ bool "ntpd"
+ depends on BR2_PACKAGE_NTP
+ default y
+ help
+ ntpd is the time synchronization daemon keeping your local
+ system date and time in sync and optionally serving time and date
+ information on the network via the NTP protocol.
+
+config BR2_PACKAGE_NTP_NTPDATE
+ bool "ntpdate"
+ depends on BR2_PACKAGE_NTP
+ help
+ The ntpdate utility program is used to set the local date and time
+ from an NTP server given as an argument.
+
config BR2_PACKAGE_NTP_NTPDC
bool "ntpdc"
depends on BR2_PACKAGE_NTP
diff --git a/package/ntp/TODO b/package/ntp/TODO
deleted file mode 100644
index ba6d7fd..0000000
--- a/package/ntp/TODO
+++ /dev/null
@@ -1,33 +0,0 @@
-The obsolete patch tries to clear "BUILT_SOURCE"
-
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-***************
-*** 157,163 ****
- bin_PROGRAMS = ntpdc
- EXTRA_PROGRAMS = ntpdc-layout
- EXTRA_DATA = check-layout
-- BUILT_SOURCES = maybe-layout
- INCLUDES = -I$(top_srcdir)/include
- # LDADD might need RESLIB and ADJLIB
- ntpdc_LDADD = version.o ../libntp/libntp.a @READLINE_LIBS@
---- 157,163 ----
- bin_PROGRAMS = ntpdc
- EXTRA_PROGRAMS = ntpdc-layout
- EXTRA_DATA = check-layout
-+ BUILT_SOURCES =
- INCLUDES = -I$(top_srcdir)/include
- # LDADD might need RESLIB and ADJLIB
- ntpdc_LDADD = version.o ../libntp/libntp.a @READLINE_LIBS@
-------------------------------------------------------------
-The current tarball contains a lot more:
-
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-AUTOMAKE_OPTIONS = ../util/ansi2knr
-EXTRA_DATA = check-layout
-BUILT_SOURCES = @MAKE_CHECK_LAYOUT@ ntpdc-opts.c ntpdc-opts.h ntpdc.1 \
- ntpdc-opts.texi ntpdc-opts.menu
-AM_CPPFLAGS = -I$(top_srcdir)/include $(LIBOPTS_CFLAGS)
-# LDADD might need RESLIB and ADJLIB
-------------------------------------------------------------
-
-Do we need to remove "@MAKE_CHECK_LAYOUT@" in a new patch?
diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
index 7e09b5e..bca5d6e 100644
--- a/package/ntp/ntp.mk
+++ b/package/ntp/ntp.mk
@@ -15,25 +15,32 @@ endif
NTP_CONF_OPT = --with-shared \
--program-transform-name=s,,, \
- --without-crypto \
--disable-tickadj \
--without-ntpsnmpd
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+NTP_CONF_OPT += --with-crypto
+NTP_DEPENDENCIES += openssl
+else
+NTP_CONF_OPT += --without-crypto
+endif
+
define NTP_PATCH_FIXUPS
$(SED) "s,^#if.*__GLIBC__.*_BSD_SOURCE.*$$,#if 0," $(@D)/ntpd/refclock_pcf.c
$(SED) '/[[:space:](]rindex[[:space:]]*(/s/[[:space:]]*rindex[[:space:]]*(/ strrchr(/g' $(@D)/ntpd/*.c
endef
-NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_SNTP) += sntp/sntp
NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTP_KEYGEN) += util/ntp-keygen
NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTP_WAIT) += scripts/ntp-wait
+NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPDATE) += ntpdate/ntpdate
NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPDC) += ntpdc/ntpdc
NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPQ) += ntpq/ntpq
NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPTRACE) += scripts/ntptrace
+NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_SNTP) += sntp/sntp
NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_TICKADJ) += util/tickadj
define NTP_INSTALL_TARGET_CMDS
- install -m 755 $(@D)/ntpd/ntpd $(TARGET_DIR)/usr/sbin/ntpd
+ $(if $(BR2_PACKAGE_NTP_NTPD), install -m 755 $(@D)/ntpd/ntpd $(TARGET_DIR)/usr/sbin/ntpd)
test -z "$(NTP_INSTALL_FILES_y)" || install -m 755 $(addprefix $(@D)/,$(NTP_INSTALL_FILES_y)) $(TARGET_DIR)/usr/bin/
install -m 755 package/ntp/ntp.sysvinit $(TARGET_DIR)/etc/init.d/S49ntp
@if [ ! -f $(TARGET_DIR)/etc/default/ntpd ]; then \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 5+ messages in thread