diff options
author | Anish Mangal <anish@sugarlabs.org> | 2011-01-05 18:23:23 (GMT) |
---|---|---|
committer | Bernie Innocenti <bernie@codewiz.org> | 2011-01-08 21:45:39 (GMT) |
commit | 2509d8e816d0dd1871397c7d16442719c13919dc (patch) | |
tree | 8fb97fb276479f638b5f7e855abb2b2bb84f5f72 | |
parent | 84d7fc8cac35313cb3d70374b6e2d8d6e2187203 (diff) |
Add rpm's and update yum updater list of repositories
Signed-off-by: Anish Mangal <anish@sugarlabs.org>
-rw-r--r-- | examples/dextrose2-xo1-nognome.ini | 5 | ||||
-rwxr-xr-x | modules/custom_scripts/yum_updater_setup.sh | 55 |
2 files changed, 4 insertions, 56 deletions
diff --git a/examples/dextrose2-xo1-nognome.ini b/examples/dextrose2-xo1-nognome.ini index a595344..e0243be 100644 --- a/examples/dextrose2-xo1-nognome.ini +++ b/examples/dextrose2-xo1-nognome.ini @@ -32,6 +32,7 @@ olpc_publicrpms_1=1,f11 olpc_publicrpms_2=1,f11-xo1 custom_repo_1=1,dextrose-dxo2,http://download.sugarlabs.org/dextrose/testing/dxo2/rpms/i386/os custom_repo_2=1,dextrose-dxo2-freeworld,http://download.sugarlabs.org/dextrose/testing/dxo2/rpms-freeworld/i386/os +custom_repo_3=1,dextrose-dxo2-py,http://download.sugarlabs.org/dextrose/testing/dxo2/rpms-py/i386/os add_excludes_to=fedora,fedora-updates,fedora-updates-testing [custom_packages] @@ -49,6 +50,8 @@ add_packages= telepathy-sofiasip, x11vnc, chkconfig, + dextrose-updater, + dextrose-updater-gui, del_packages= abyssinica-fonts, at, @@ -90,6 +93,7 @@ del_packages= [yumcfg] addrepo_1=1,dextrose,http://download.sugarlabs.org/dextrose/testing/dxo2/rpms/i386/os addrepo_2=1,dextrose-freeworld,http://download.sugarlabs.org/dextrose/testing/dxo2/rpms-freeworld/i386/os +addrepo_3=1,dextrose-py,http://download.sugarlabs.org/dextrose/testing/dxo2/rpms-py/i386/os add_excludes_to=fedora,fedora-updates,fedora-updates-testing @@ -217,7 +221,6 @@ path=buildnr-dx custom_script_1=modules/custom_scripts/set_protected_list.sh custom_script_2=modules/custom_scripts/sugar_coredump.sh custom_script_3=modules/custom_scripts/libertas_debug.sh -custom_script_4=modules/custom_scripts/yum_updater_setup.sh [base] versioned_fs=0 diff --git a/modules/custom_scripts/yum_updater_setup.sh b/modules/custom_scripts/yum_updater_setup.sh deleted file mode 100755 index 8538b6b..0000000 --- a/modules/custom_scripts/yum_updater_setup.sh +++ /dev/null @@ -1,55 +0,0 @@ -cat >>"$INSTALL_ROOT/etc/default/dextrose-update" <<__EOF__ -DEXTROSE_YUM_REPO=dextrose -__EOF__ - -cat >>"$INSTALL_ROOT/usr/sbin/dextrose-update" <<__EOF__ -#!/bin/sh - -name="dextrose-update" -. /etc/default/\${name} - -logfile="/var/log/\${name}" - -reboot_pkgs="kernel kernel-firmware" -relogin_pkgs="sugar sugar-artwork sugar-base sugar-datastore sugar-presence-service sugar-toolkit" - -yum="/usr/bin/yum --disablerepo=* --enablerepo=\${DEXTROSE_YUM_REPO} --skip-broken --quiet" - -updates() { - \${yum} -e0 check-update | awk '/./{print \$1 "-" \$2}' -} - -to_update=\$(updates) -[ "\${to_update}" ] || exit 0 - -parse() { - for i in \$@; do - echo \${to_update} | grep "\(^\| \)\$i\." >/dev/null && echo \$i - done -} - -need_reboot=\$(parse \${reboot_pkgs}) -need_relogin=\$(parse \${relogin_pkgs}) - -echo "\$(date)" >> \$logfile -echo -e "\tRepository:" \${DEXTROSE_YUM_REPO} >> \$logfile -echo -e "\tPackages to update:" \${to_update} >> \$logfile -\${yum} -y update >> \$logfile 2>&1 -to_update=\$(updates) - -if [ "\${need_reboot}" ]; then - if [ "\${need_reboot}" != "\$(parse \${reboot_pkgs})" ]; then - echo -e "\tNeed to reboot..." >> \$logfile - dbus-send --system /org/sugarlabs/system org.sugarlabs.system.Reboot - fi -fi - -if [ "\${need_relogin}" ]; then - if [ "\${need_relogin}" != "\$(parse \${relogin_pkgs})" ]; then - echo -e "\tNeed to relogin..." >> \$logfile - dbus-send --system /org/sugarlabs/system org.sugarlabs.system.Relogin - fi -fi -__EOF__ - -ln -s $INSTALL_ROOT/usr/sbin/dextrose-update $INSTALL_ROOT/etc/cron.daily |