summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/cyrus-sasl/cyrus-sasl_2.1.19.bb2
-rw-r--r--packages/ntp/files/ntp.conf5
-rw-r--r--packages/openslug-init/openslug-init-0.10/turnup19
-rw-r--r--packages/openslug-init/openslug-init_0.10.bb1
4 files changed, 9 insertions, 18 deletions
diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
index 37c8292595..7109a54812 100644
--- a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
+++ b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
@@ -14,6 +14,8 @@ EXTRA_OECONF = "--enable-shared --enable-static --with-dblib=berkeley \
--with-bdb-incdir=${STAGING_INCDIR} \
--without-opie --without-des"
+FILES_${PN} += "${prefix}/lib/sasl2/*.so*"
+
do_configure_prepend () {
rm -f acinclude.m4 config/libtool.m4
}
diff --git a/packages/ntp/files/ntp.conf b/packages/ntp/files/ntp.conf
index 4cb3ae176e..02a44b0d01 100644
--- a/packages/ntp/files/ntp.conf
+++ b/packages/ntp/files/ntp.conf
@@ -6,3 +6,8 @@ driftfile /etc/ntp.drift
# (in IP terms) to the machine. Add other servers
# as required, or change this.
server pool.ntp.org
+# Using local hardware clock as fallback
+server 127.127.1.0
+fudge 127.127.1.0 stratum 14
+# Defining a default security setting
+restrict default nomodify nopeer
diff --git a/packages/openslug-init/openslug-init-0.10/turnup b/packages/openslug-init/openslug-init-0.10/turnup
index 14756fc661..86c573a93b 100644
--- a/packages/openslug-init/openslug-init-0.10/turnup
+++ b/packages/openslug-init/openslug-init-0.10/turnup
@@ -195,20 +195,6 @@ setup_var() {
}
#
-# setup_files new
-# At present just puts the rmrecovery links in.
-setup_files() {
- test -n "$1" -a -d "$1"/etc || {
- echo "turnup: setup_files($1): expected a directory" >&2
- return 1
- }
- #
- # add the script to remove .recovery
- update-rc.d -r "$1" rmrecovery start 99 1 2 3 4 5 .
- return 0
-}
-
-#
# setup_syslog new
# Moves the syslog to a file - appropriate for disk and nfs types, not
# otherwise.
@@ -258,14 +244,11 @@ setup_rootfs() {
flash) return 0;;
disk) setup_dev "$new" "$table" &&
setup_var "$new" disk &&
- setup_files "$new" &&
setup_syslog "$new";;
memstick)
- setup_bootdev "$new" "$table" &&
- setup_files "$new";;
+ setup_bootdev "$new" "$table" ;;
nfs) setup_dev "$new" "$table" &&
setup_var "$new" nfs &&
- setup_files "$new" &&
setup_syslog "$new";;
*) echo "turnup: setup_rootfs: $type: unknown rootfs type" >&2
return 1;;
diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb
index f0af1aa9fb..c9af6e2a46 100644
--- a/packages/openslug-init/openslug-init_0.10.bb
+++ b/packages/openslug-init/openslug-init_0.10.bb
@@ -121,6 +121,7 @@ pkg_postinst_openslug-init() {
update-rc.d $opt syslog.file start 39 S . start 47 0 6 .
update-rc.d $opt syslog.network start 44 S . start 39 0 6 .
update-rc.d $opt zleds start 99 S 1 2 3 4 5 . stop 5 0 1 2 3 4 5 6 .
+ update-rc.d $opt rmrecovery start 99 1 2 3 4 5 .
# bug fix for startup
update-rc.d $opt leds_startup start 1 1 2 3 4 5 .
}