This email list is read-only. Emails sent to this list will be discarded
----------------------------------
ChangeLog | 7 +++++++
scripts/moblin-kernel-modules | 14 --------------
scripts/moblin-settings.spec | 8 ++++----
3 files changed, 11 insertions(+), 18 deletions(-)
New commits:
commit 77ffb48b0a4aff3c69e9b7de745a89780bddcfa6
Author: Todd Brandt <[EMAIL PROTECTED]>
Date: Fri Sep 5 14:15:05 2008 -0700
moblin 2.0 build
Diff in this email is a maximum of 400 lines.
diff --git a/ChangeLog b/ChangeLog
index 0ee1b06..44d9c7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+moblin-settings (2.21)
+
+ * Removed the ubuntu module loads from moblin-kernel-modules
+ * got the build up and running on the moblin2 build site
+
+ -- Todd Brandt <[EMAIL PROTECTED]> Fri Sep 5 14:12:12 PDT 2008
+
moblin-settings (2.20)
* Removed the touchscreen from the rpm build
diff --git a/scripts/moblin-kernel-modules b/scripts/moblin-kernel-modules
index e591288..ed49d68 100755
--- a/scripts/moblin-kernel-modules
+++ b/scripts/moblin-kernel-modules
@@ -36,19 +36,12 @@ load_modules() {
# Get list of available modules
LOC="/lib/modules/`uname -r`/kernel/drivers/acpi"
- LOC2="/lib/modules/`uname -r`/kernel/ubuntu/acpi"
if [ -d $LOC ]; then
MODAVAIL=`( find $LOC -type f -name "*.o" -printf "basename %f .o\n";
\
find $LOC -type f -name "*.ko" -printf "basename %f .ko\n" ) |
/bin/sh`
else
MODAVAIL=""
fi
-
- if [ -d $LOC2 ]; then
- MODAVAIL="$MODAVAIL `( find $LOC2 -type f -name "*.o" -printf
"basename %f .o\n"; \
- find $LOC2 -type f -name "*.ko" -printf "basename %f .ko\n" ) |
/bin/sh`"
- fi
-
MODULES="$MODAVAIL"
if [ -n "$MODULES" ]; then
@@ -81,19 +74,12 @@ unload_modules() {
# Get list of available modules
LOC="/lib/modules/`uname -r`/kernel/drivers/acpi"
- LOC2="/lib/modules/`uname -r`/kernel/ubuntu/acpi"
if [ -d $LOC ]; then
MODAVAIL=`( find $LOC -type f -name "*.o" -printf "basename %f .o\n";
\
find $LOC -type f -name "*.ko" -printf "basename %f .ko\n" ) |
/bin/sh`
else
MODAVAIL=""
fi
-
- if [ -d $LOC2 ]; then
- MODAVAIL="$MODAVAIL `( find $LOC2 -type f -name "*.o" -printf
"basename %f .o\n"; \
- find $LOC2 -type f -name "*.ko" -printf "basename %f .ko\n" ) |
/bin/sh`"
- fi
-
MODULES="$MODAVAIL"
if [ -n "$MODULES" ]; then
diff --git a/scripts/moblin-settings.spec b/scripts/moblin-settings.spec
index 75f2502..7efd7ad 100644
--- a/scripts/moblin-settings.spec
+++ b/scripts/moblin-settings.spec
@@ -1,6 +1,6 @@
Summary: Moblin System Settings
Name: moblin-settings
-Version: 2.20
+Version: 2.21
Release: 1%{?dist}
URL: http://moblin.org
Source0: http://moblin.org/repos/releases/%{name}-%{version}.tar.gz
@@ -18,8 +18,8 @@ BuildRequires: dbus-glib-devel >= 0.70
BuildRequires: dbus-glib >= 0.70
BuildRequires: PolicyKit-devel >= 0.7
BuildRequires: alsa-lib-devel >= 0.9.0
-BuildRequires: hal >= 0.5.8
-#BuildRequires: libX11-devel
+BuildRequires: hal-devel >= 0.5.8
+#BuildRequires: libX11-devel -- UNCOMMENT FOR TOUCHSCREEN
BuildRequires: docbook-utils
Requires: dbus >= 0.90
@@ -103,7 +103,7 @@ fi
%dir %{_datadir}/dbus-1/system-services
%{_datadir}/dbus-1/system-services/org.moblin.SystemDaemon.service
%{_sbindir}/moblin-system-daemon
-%{_bindir}/moblin-touchdump
+# %{_bindir}/moblin-touchdump -- UNCOMMENT FOR TOUCHSCREEN
%{_bindir}/moblin-system-tool
%{_mandir}/man1/*
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
