Skip to content
Snippets Groups Projects
Commit 885a8e78 authored by Ruben Rodriguez's avatar Ruben Rodriguez
Browse files

Fixed update-manager distupgrader script

parent 429bfd6d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
helpers/make-update-manager
+ 26
− 33
View file @ 885a8e78
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
# gpg -ba release_name.tar.gz # gpg -ba release_name.tar.gz
# Also, don't forget to update the meta-release files at archive and packages.t.i # Also, don't forget to update the meta-release files at archive and packages.t.i
VERSION=1 VERSION=4
. ./config . ./config
...@@ -32,9 +32,9 @@ sed s/self.checkForNvidia/#self.checkForNvidia/ DistUpgrade/DistUpgradeCache.py ...@@ -32,9 +32,9 @@ sed s/self.checkForNvidia/#self.checkForNvidia/ DistUpgrade/DistUpgradeCache.py
sed s/self._test_and_warn_on_old_nvidia/#self._test_and_warn_on_old_nvidia/ -i DistUpgrade/DistUpgradeQuirks.py sed s/self._test_and_warn_on_old_nvidia/#self._test_and_warn_on_old_nvidia/ -i DistUpgrade/DistUpgradeQuirks.py
sed s/self._test_and_warn_on_nvidia_and_no_sse/#self._test_and_warn_on_nvidia_and_no_sse/ -i DistUpgrade/DistUpgradeQuirks.py sed s/self._test_and_warn_on_nvidia_and_no_sse/#self._test_and_warn_on_nvidia_and_no_sse/ -i DistUpgrade/DistUpgradeQuirks.py
sed s/self._test_and_warn_on_dropped_fglrx_support/#self._test_and_warn_on_dropped_fglrx_support/ -i DistUpgrade/DistUpgradeQuirks.py sed s/self._test_and_warn_on_dropped_fglrx_support/#self._test_and_warn_on_dropped_fglrx_support/ -i DistUpgrade/DistUpgradeQuirks.py
sed /nvidia/d debian/control -i sed '/nvidia/d' debian/control DistUpgrade/build-tarball.sh -i
sed /nvidia/d DistUpgrade/build-tarball.sh -i
rm tests/test-data/xorg.conf.fglrx rm tests/test-data/xorg.conf.fglrx
#% Make sure nvidia-common and fglrx-modaliases are not installed #% Make sure nvidia-common and fglrx-modaliases are not installed
apt-get remove --purge -y nvidia-common || true apt-get remove --purge -y nvidia-common || true
apt-get remove --purge -y fglrx-modaliases || true apt-get remove --purge -y fglrx-modaliases || true
...@@ -135,7 +135,7 @@ cat << EOF > DistUpgrade/EOLReleaseAnnouncement ...@@ -135,7 +135,7 @@ cat << EOF > DistUpgrade/EOLReleaseAnnouncement
You are atempting to upgrade to a version of Trisquel that is no longer You are atempting to upgrade to a version of Trisquel that is no longer
supported. Since we do only keep upgrade packages for decomissioned releases supported. Since we do only keep upgrade packages for decomissioned releases
for, a while, this upgrade may fail. Try the sandbox method first (by running for a while, this upgrade may fail. Try the sandbox method first (by running
update-manager -s) or ask in our forums, lists or irc channels if you are update-manager -s) or ask in our forums, lists or irc channels if you are
unsure about this procedure. unsure about this procedure.
...@@ -214,7 +214,7 @@ cat << EOF > DistUpgrade/DistUpgrade.cfg ...@@ -214,7 +214,7 @@ cat << EOF > DistUpgrade/DistUpgrade.cfg
[View] [View]
# the views will be tried in this order, if one fails to import, the next # the views will be tried in this order, if one fails to import, the next
# is tried # is tried
View=DistUpgradeViewGtk,DistUpgradeViewKDE,DistUpgradeViewText View=DistUpgradeViewGtk,DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText
#View=DistUpgradeViewNonInteractive #View=DistUpgradeViewNonInteractive
#Depends= python-apt (>= 0.6.0), apt (>= 0.6) #Depends= python-apt (>= 0.6.0), apt (>= 0.6)
# the views below support upgrades over ssh connection # the views below support upgrades over ssh connection
...@@ -223,8 +223,8 @@ SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive ...@@ -223,8 +223,8 @@ SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
# Distro contains global information about the upgrade # Distro contains global information about the upgrade
[Distro] [Distro]
# the meta-pkgs we support # the meta-pkgs we support
MetaPkgs=trisquel, trisquel-mini, triskel MetaPkgs=trisquel, trisquel-mini
BaseMetaPkgs=trisquel-base, trisquel-desktop-common, trisquel-minimal BaseMetaPkgs=trisquel-base, trisquel-desktop-common, trisquel-gnome-base, trisquel-minimal
Demotions=demoted.cfg Demotions=demoted.cfg
RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
RemovalBlacklistFile=removal_blacklist.cfg RemovalBlacklistFile=removal_blacklist.cfg
...@@ -234,12 +234,12 @@ KeepInstalledSection=translations ...@@ -234,12 +234,12 @@ KeepInstalledSection=translations
RemoveObsoletes=yes RemoveObsoletes=yes
ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
# hints for for stuff that should be done early # hints for for stuff that should be done early
PostUpgradePurge=ltsp-client, ltspfsd PostUpgradePurge=ltsp-client, ltspfsd, linux-restricted-modules-common
PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp, gnome-session, gnome-shell, abrowser-globalmenu, appmenu-gtk3, appmenu-gtk PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp
PostUpgradeUpgrade=brasero PostUpgradeUpgrade=brasero
#PostUpgradeInstall=apt #PostUpgradeInstall=apt
PostInstallScripts=./trisquel-postinstall.sh PostInstallScripts=./trisquel-postinstall.sh
EnableApport=no EnableApport=yes
# this supported blacklisting certain versions to ensure we do not upgrade # this supported blacklisting certain versions to ensure we do not upgrade
# - blcr-dkms fails to build on kernel 2.6.35 # - blcr-dkms fails to build on kernel 2.6.35
BadVersions=blcr-dkms_0.8.2-13 BadVersions=blcr-dkms_0.8.2-13
...@@ -247,33 +247,33 @@ BadVersions=blcr-dkms_0.8.2-13 ...@@ -247,33 +247,33 @@ BadVersions=blcr-dkms_0.8.2-13
#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/ #SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
[KernelRemoval] [KernelRemoval]
Version=2.6.38 Version=3.0.0
BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,linux-header-lbm BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,linux-header-lbm
Types=386,ec2,generic,rt,server,virtual Types=386,ec2,generic,rt,server,virtual
# information about the individual meta-pkgs # information about the individual meta-pkgs
[trisquel] [trisquel]
KeyDependencies=lightdm, trisquel-gtk-theme, trisquel-sounds KeyDependencies=gdm
# those pkgs will be marked remove right after the distUpgrade in the cache # those pkgs will be marked remove right after the distUpgrade in the cache
PostUpgradeRemove=gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner, gnome-session, gnome-shell, abrowser-globalmenu, appmenu-gtk3, appmenu-gtk PostUpgradeRemove=xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount
[trisquel-mini] [trisquel-mini]
KeyDependencies=lxde, lxdm, trisquel-mini-data KeyDependencies=trisquel-mini-data
ForcedObsoletes=cups-pdf #Remove previous gnome component from lubuntu to avoid pulling gnome depends on upgrade (LP: #945215)
PostUpgradeRemove=gnome-bluetooth, gnome-power-manager
[Files] [Files]
BackupExt=distUpgrade BackupExt=distUpgrade
LogDir=/var/log/dist-upgrade/ LogDir=/var/log/dist-upgrade/
[Sources] [Sources]
From=dagda From=brigantia
To=brigantia To=toutatis
ValidOrigin=Trisquel ValidOrigin=Trisquel
ValidMirrors = mirrors.cfg ValidMirrors = mirrors.cfg
Components=main Components=main
Pockets=security,updates,backports Pockets=security,updates,backports
;AllowThirdParty=False
;[PreRequists] ;[PreRequists]
;Packages=release-upgrader-apt,release-upgrader-dpkg ;Packages=release-upgrader-apt,release-upgrader-dpkg
...@@ -306,9 +306,8 @@ EOF ...@@ -306,9 +306,8 @@ EOF
cat << EOF1 > DistUpgrade/trisquel-postinstall.sh cat << EOF1 > DistUpgrade/trisquel-postinstall.sh
#!/bin/sh #!/bin/sh
sed -i 's:/archive.trisquel.info/:/es.archive.trisquel.info/:g; s/extras//g;' /etc/apt/sources.list # Making sure this is gone
apt-get remove --force-yes -y notification-daemon
[ -f /boot/grub/menu.lst ] && sed 's/Trisquel.*,/Trisquel 5.5,/g' /boot/grub/menu.lst -i
if ! [ -f /etc/grub.d/01_PASSWORD ]; then if ! [ -f /etc/grub.d/01_PASSWORD ]; then
cat << EOF > /etc/grub.d/01_PASSWORD cat << EOF > /etc/grub.d/01_PASSWORD
...@@ -321,34 +320,28 @@ echo set superusers=grub ...@@ -321,34 +320,28 @@ echo set superusers=grub
echo password grub \$(bash -c 'echo \$RANDOM') echo password grub \$(bash -c 'echo \$RANDOM')
EOF EOF
fi fi
chmod 700 /etc/grub.d/01_PASSWORD
# Let's do some extra purging
export DEBIAN_FRONTEND=noninteractive
apt-get -y --force-yes remove gnome-session gnome-shell abrowser-globalmenu appmenu-gtk3 appmenu-gtk
dpkg -l trisquel |grep ii -q && apt-get -y --force-yes install trisquel-recommended
dpkg -l trisquel-mini |grep ii -q && apt-get -y --force-yes install trisquel-mini-recommended
# Just in case
update-initramfs -u update-initramfs -u
update-grub update-grub
EOF1 EOF1
chmod 755 DistUpgrade/trisquel-postinstall.sh chmod 755 DistUpgrade/trisquel-postinstall.sh
rm DistUpgrade/demoted.cfg echo "notification-daemon" > DistUpgrade/demoted.cfg
echo > DistUpgrade/demoted.cfg
#sed -i 's:changelogs\.ubuntu\.com:packages\.trisquel\.info:g' UpdateManager/*.py DistUpgrade/*.py ./po/*.po UpdateManager/Core/*.py data/meta-release
replace changelogs.ubuntu.com packages.trisquel.info . replace changelogs.ubuntu.com packages.trisquel.info .
sed -i 's/�~Lubuntu/�~Ltrisquel/g; s/被ubuntu/被trisquel/g; s#http://launchpad.net/ubuntu/+source/%s/%s/+changelog#http://trisquel.info/project/issues#g; s/<.*@ubuntu.com/<info@trisquel.info/g; s/ ubuntu\n/ trisquel\n/g; s/ubuntu\ /trisquel\ /g; s/\ ubuntu/\ trisquel/g; s/Ubuntu/Trisquel/g; s/ubuntu-desktop/trisquel-/g; s/www.ubuntu.com/trisquel.info/g; s/www.ubuntulinux.org/trisquel.info/g ' po/*.po $(find | grep py$) $(find | grep '\.glade$') /bin/sed -i 's/�~Lubuntu/�~Ltrisquel/g; s/被ubuntu/被trisquel/g; s#http://launchpad.net/ubuntu/+source/%s/%s/+changelog#http://trisquel.info/project/issues#g; s/<.*@ubuntu.com/<info@trisquel.info/g; s/ ubuntu\n/ trisquel\n/g; s/ubuntu\ /trisquel\ /g; s/\ ubuntu/\ trisquel/g; s/Ubuntu/Trisquel/g; s/ubuntu-desktop/trisquel-/g; s/www.ubuntu.com/trisquel.info/g; s/www.ubuntulinux.org/trisquel.info/g ' po/*.po $(find | grep py$) $(find | grep '\.glade$')
#sed -i 's/�~Lubuntu/�~Ltrisquel/g; s/被ubuntu/被trisquel/g; s#http://launchpad.net/ubuntu/+source/%s/%s/+changelog#http://trisquel.info/project/issues#g; s/<.*@ubuntu.com/<info@trisquel.info/g; s/ ubuntu\n/ trisquel\n/g; s/ubuntu\ /trisquel\ /g; s/\ ubuntu/\ trisquel/g; s/Ubuntu/Trisquel/g; s/xubuntu/trisquel-mini/g; s/kubuntu/trisquel-pro/g; s/edubuntu/trisquel-edu/g; s/ubuntu-desktop/trisquel-/g; s/www.ubuntu.com/trisquel.info/g; s/www.ubuntulinux.org/trisquel.info/g ' po/*.po $(find | grep py$) $(find | grep '\.glade$')
apt-get install --force-yes -y rpl apt-get install --force-yes -y rpl
rpl 11\.04 5\.0 DistUpgrade/*.ui rpl 11\.04 5\.0 DistUpgrade/*.ui
rpl 11\.04 5\.0 po/* -R rpl 11\.04 5\.0 po/* -R
rpl 11\.10 5\.5 DistUpgrade/*.ui rpl 11\.10 5\.5 DistUpgrade/*.ui
rpl 11\.10 5\.5 po/* -R rpl 11\.10 5\.5 po/* -R
rpl 12\.04 6\.0 DistUpgrade/*.ui
rpl 12\.04 6\.0 po/* -R
rpl $UPSTREAM $CODENAME . -R rpl $UPSTREAM $CODENAME . -R
rpl oneiric brigantia . -R
rpl natty dagda . -R rpl natty dagda . -R
rpl maverick slaine . -R rpl maverick slaine . -R
rpl lucid taranis . -R rpl lucid taranis . -R
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment