diff options
| author | Anish Mangal <anish@sugarlabs.org> | 2011-03-02 18:54:13 (GMT) |
|---|---|---|
| committer | Anish Mangal <anish@sugarlabs.org> | 2011-03-02 18:54:13 (GMT) |
| commit | 280ea76b99c4a92c64bd355fa1910443e4961a84 (patch) | |
| tree | d832e50c10776f444b0dd6f1de04037a9f1d19f4 | |
| parent | c7c6bf27801a1ec6d0902056c0ec98fcc46f8b30 (diff) | |
bump v2 for dextrose-platform
| -rw-r--r-- | rpms/dextrose-platform/dextrose-platform-disable_mesh-exit-if-already-disabled.patch | 16 | ||||
| -rw-r--r-- | rpms/dextrose-platform/dextrose-platform.spec | 11 |
2 files changed, 5 insertions, 22 deletions
diff --git a/rpms/dextrose-platform/dextrose-platform-disable_mesh-exit-if-already-disabled.patch b/rpms/dextrose-platform/dextrose-platform-disable_mesh-exit-if-already-disabled.patch deleted file mode 100644 index 5bd40a0..0000000 --- a/rpms/dextrose-platform/dextrose-platform-disable_mesh-exit-if-already-disabled.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/etc/powerd/postresume.d/disable_mesh.sh b/etc/powerd/postresume.d/disable_mesh.sh -index 7d64c07..0aea85a 100755 ---- a/etc/powerd/postresume.d/disable_mesh.sh -+++ b/etc/powerd/postresume.d/disable_mesh.sh -@@ -26,6 +26,11 @@ - - LBS_MESH=/sys/class/net/eth0/lbs_mesh - -+if [ -f $LBS_MESH ] && [ $(cat $LBS_MESH) = "0x0" ] -+then -+ exit 0 -+fi -+ - while [ ! -f $LBS_MESH ] || [ $(cat $LBS_MESH) = "0x0" ] - do - sleep 0.5s diff --git a/rpms/dextrose-platform/dextrose-platform.spec b/rpms/dextrose-platform/dextrose-platform.spec index a984da0..49d3c72 100644 --- a/rpms/dextrose-platform/dextrose-platform.spec +++ b/rpms/dextrose-platform/dextrose-platform.spec @@ -1,6 +1,6 @@ Name: dextrose-platform -Version: 1 -Release: 2%{?dist} +Version: 2 +Release: 1%{?dist} Summary: A wrapper package containing dextrose-platform specific bugfixes. Group: Applications/Updating @@ -8,8 +8,6 @@ License: GPLv3 #URL: http://wiki.sugarlabs.org/go/Dextrose/Updater Source0: http://people.sugarlabs.org/anish/dextrose-platform.tar.gz -patch1: dextrose-platform-disable_mesh-exit-if-already-disabled.patch - BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -24,8 +22,6 @@ A wrapper package containing dextrose-platform specific bugfixes. %prep %setup -q -%patch1 -p1 - %build @@ -47,6 +43,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} /etc/powerd/postresume.d/disable_mesh.sh %changelog +* Wed Mar 2 2011 Anish Mangal <anish@sugarlabs.org> 2-1 +- Exit disable_mesh if not on a xo1. (tch) + * Tue Feb 10 2011 Anish Mangal <anish@sugarlabs.org> 1-2 - Disable mesh if already disabled. |