CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated release-upgrader for flidas release

Browse source
This commit is contained in:
Ruben Rodriguez 2018-03-18 20:01:52 -04:00
parent 75cdb0ff8e
commit e993697a7b
3 changed files with 23 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

42
helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg
View file

@ -1,9 +1,9 @@
[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=DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText View=DistUpgradeViewGtk3,DistUpgradeViewGtk,DistUpgradeViewKDE,DistUpgradeViewText
#View=DistUpgradeViewNonInteractive #View=DistUpgradeViewNonInteractive
Depends= apt (>= 1.0.10.2ubuntu2) #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
SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
@ -13,46 +13,42 @@ SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
MetaPkgs=trisquel-recommended, trisquel-mini-recommended, triskel-recommended, trisquel-sugar-recommended MetaPkgs=trisquel-recommended, trisquel-mini-recommended, triskel-recommended, trisquel-sugar-recommended
BaseMetaPkgs=trisquel-minimal, trisquel-base-recommended BaseMetaPkgs=trisquel-minimal, trisquel-base-recommended
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
# if those packages were installed, make sure to keep them installed # if those packages were installed, make sure to keep them installed
KeepInstalledPkgs=xserver-xorg-video-all KeepInstalledPkgs=gnumeric, hpijs, xserver-xorg-video-all
KeepInstalledSection=translations KeepInstalledSection=translations
RemoveObsoletes=yes RemoveObsoletes=yes
#ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools, gnome-session-flashback
# hints for for stuff that should be done right after the cache calculated # hints for for stuff that should be done early
# the dist-upgrade (not to be confused with the PostUpgrade hooks in the PostUpgradePurge=ltsp-client, ltspfsd
# quirks handling) PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp, kdm, xsettings-kde
#PostUpgradePurge=linux-restricted-modules-common PostUpgradeUpgrade=brasero,edubuntu-desktop
#PostUpgradeRemove=xsettings-kde
#PostUpgradeUpgrade=brasero,edubuntu-desktop
#PostUpgradeInstall=apt #PostUpgradeInstall=apt
PostInstallScripts=./xorg_fix_proprietary.py PostInstallScripts=./trisquel-postinstall.sh
EnableApport=yes 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
# ubiquity slideshow # ubiquity slideshow
#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/ #SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
[KernelRemoval] [KernelRemoval]
Version=4.2.0 Version=3.2.0
BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules, BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,linux-header-lbm
linux-header-lbm,linux-signed-image,linux-tools,linux-cloud-tools, Types=386,ec2,generic,rt,server,virtual
linux-image-extra
Types=386,ec2,generic,generic-lpae,lowlatency,powerpc-e500mc,powerpc-smp,
powerpc64-emb,powerpc64-smp,rt,server,virtual
# information about the individual meta-pkgs # information about the individual meta-pkgs
[trisquel] [trisquel]
KeyDependencies=trisquel-desktop-common-data, unity-greeter, trisquel-session KeyDependencies=trisquel-desktop-common-data, unity-greeter
# 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=casper, xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner, compiz-core, gdm, gnome-ppp, gwibber, remmina-common PostUpgradeRemove=casper, xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner, compiz-core, gdm, gnome-ppp, gwibber, remmina-common
ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, gdm, notification-daemon ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, notification-daemon, trisquel-session, libcogl15, libcogl-pango15
[trisquel-mini] [trisquel-mini]
KeyDependencies=trisquel-mini-data unity-greeter KeyDependencies=trisquel-mini-data unity-greeter
PostUpgradeRemove=casper #Remove previous gnome component from ltrisquel to avoid pulling gnome depends on upgrade (LP: #945215)
PostUpgradeRemove=casper, gnome-bluetooth, gnome-power-manager
[Files] [Files]
BackupExt=distUpgrade BackupExt=distUpgrade
@ -64,7 +60,7 @@ To=flidas
ValidOrigin=Trisquel ValidOrigin=Trisquel
ValidMirrors = mirrors.cfg ValidMirrors = mirrors.cfg
Components=main Components=main
Pockets=security,updates,proposed,backports Pockets=security,updates,backports
;AllowThirdParty=False ;AllowThirdParty=False
;[PreRequists] ;[PreRequists]

4
helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.belenos
View file

@ -40,10 +40,10 @@ Types=386,ec2,generic,rt,server,virtual
# information about the individual meta-pkgs # information about the individual meta-pkgs
[trisquel] [trisquel]
KeyDependencies=trisquel-desktop-common-data, unity-greeter, trisquel-session KeyDependencies=trisquel-desktop-common-data, unity-greeter
# 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=casper, xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner, compiz-core, gdm, gnome-ppp, gwibber, remmina-common PostUpgradeRemove=casper, xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner, compiz-core, gdm, gnome-ppp, gwibber, remmina-common
ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, gdm, notification-daemon ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, notification-daemon, trisquel-session, libcogl15, libcogl-pango15
[trisquel-mini] [trisquel-mini]
KeyDependencies=trisquel-mini-data unity-greeter KeyDependencies=trisquel-mini-data unity-greeter

5
helpers/make-ubuntu-release-upgrader
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2008-2017 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2008-2018 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2014 Santiago Rodriguez <santi@trisquel.info> # Copyright (C) 2014 Santiago Rodriguez <santi@trisquel.info>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -23,7 +23,7 @@
# 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
# The "obsoletes" list from ubuntu has been removed # The "obsoletes" list from ubuntu has been removed
VERSION=1 VERSION=2
. ./config . ./config
@ -202,7 +202,6 @@ cat <<EOF > data/removal_blacklist.cfg
trisquel-base trisquel-base
trisquel-minimal trisquel-minimal
trisquel-desktop-common trisquel-desktop-common
trisquel
trisquel-mini trisquel-mini
triskel triskel
trisquel-sugar trisquel-sugar