diff options
Diffstat (limited to 'conf/distro/include')
-rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 1 | ||||
-rw-r--r-- | conf/distro/include/preferred-slugos-versions.inc | 6 | ||||
-rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
-rw-r--r-- | conf/distro/include/slugos.inc | 2 |
4 files changed, 2 insertions, 9 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index e3e21872b7..8c5c4f7cb0 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -712,7 +712,6 @@ PREFERRED_VERSION_inkscape ?= "0.43" PREFERRED_VERSION_inkwp ?= "0.1.1" PREFERRED_VERSION_inotify-tools ?= "2.1" PREFERRED_VERSION_inputproto ?= "1.4.4" -PREFERRED_VERSION_install-native ?= "0.1" PREFERRED_VERSION_insttrain ?= "1.0.5" PREFERRED_VERSION_interbench ?= "0.30" PREFERRED_VERSION_intercom ?= "0.15" diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index 8c8de40f9d..992235a4b9 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -71,9 +71,3 @@ PREFERRED_VERSION_libusb ?= "0.0.0" # boost 1.36 won't build PREFERRED_VERSION_boost ?= "1.33.1" - -# We don't really care which openssl and openssl-native we get, but -# the DEFAULT_PREFERENCE set in the recipes is such that if we don't -# specify explicitly, we may get mismatched versions. -PREFERRED_VERSION_openssl ?= "0.9.8j" -PREFERRED_VERSION_openssl-native ?= "0.9.8j" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index af768c33da..8962174814 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -252,7 +252,7 @@ SRCREV_pn-webkit-gtk ?= "42127" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-wmiconfig ?= "4522" -SRCREV_pn-xf86-video-glamo ?= "8062d7aa7bac7e06c1a00bd88ca78098550606ed" +SRCREV_pn-xf86-video-glamo ?= "16a993d8b17ef623a21b003f6f08adb86c76de77" SRCREV_pn-xoo ?= "1971" SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52" SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index b141548ce3..51ca9f34b1 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -81,7 +81,7 @@ FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME} # to enable/disable debugging in the distro. Here noirqdebug is used to # remove the messages about unhandled interrupts - people debugging interrupt # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) -CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc" +CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rootflags=noatime rw init=/linuxrc" CMDLINE_DEBUG = "noirqdebug" # EXTRA PACKAGES |