diff --git a/ChangeLog.txt b/ChangeLog.txt index ae3f290..6d13193 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,13 @@ +Sun Jan 24 20:19:11 CET 2021 +pkg/slackpkg+-1.7.0d1-noarch-11mt.txz: Rebuilt + - Fixed counter on big package lists (thank chrisretusn for reporting) + - Added percentage to download process + - Improved "Installing..." and "Upgrading..." messages + - zlookkernel: select huge or generic kernel according the running + kernel instead the vmlinuz link + - Removed ktown from default repositories ++-------------------------+ + Sun Mar 15 21:36:19 CET 2020 pkg/slackpkg+-1.7.0d1-noarch-10mt.txz: Rebuilt - Small fix in search packages diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt index ae3f290..6d13193 100644 --- a/src/ChangeLog.txt +++ b/src/ChangeLog.txt @@ -1,3 +1,13 @@ +Sun Jan 24 20:19:11 CET 2021 +pkg/slackpkg+-1.7.0d1-noarch-11mt.txz: Rebuilt + - Fixed counter on big package lists (thank chrisretusn for reporting) + - Added percentage to download process + - Improved "Installing..." and "Upgrading..." messages + - zlookkernel: select huge or generic kernel according the running + kernel instead the vmlinuz link + - Removed ktown from default repositories ++-------------------------+ + Sun Mar 15 21:36:19 CET 2020 pkg/slackpkg+-1.7.0d1-noarch-10mt.txz: Rebuilt - Small fix in search packages diff --git a/src/README b/src/README index ef0b2b4..4ebbe6c 100644 --- a/src/README +++ b/src/README @@ -122,8 +122,8 @@ accepts the following kinds of argument: 4) repository-name, for example # slackpkg upgrade alienbob upgrades all packages in the alienbob repository, and - # slackpkg install ktown - installs all packages in the ktown repository + # slackpkg install multilib + installs all packages in the multilib repository 5) repository-name:package-name, for example # slackpkg install slacky:openjdk @@ -165,16 +165,16 @@ for example: accepts a regular expression, so for example PKGS_PRIORITY=( restricted:.* vlc.* ) means 'all packages containing the "vlc" string' - PKGS_PRIORITY=( ktown:.* ) -means 'all packages in repository ktown' + PKGS_PRIORITY=( alienbob:.* ) +means 'all packages in repository alienbob' latest item maybe replaced simply with - PKGS_PRIORITY=( ktown ) + PKGS_PRIORITY=( alienbob ) -all packages matched from ktown ovverride all related slackware packages, unless +all packages matched from alienbob ovverride all related slackware packages, unless you do not explicitly exclude it: - PKGS_PRIORITY=( patches:harfbuzz slackware64:harfbuzz ktown ) -that means 'all ktown packages except harfbuzz' + PKGS_PRIORITY=( patches:harfbuzz slackware64:harfbuzz alienbob ) +that means 'all alienbob packages except harfbuzz' Also you can set TAG_PRIORITY=on to allow slackpkg+ to select repository @@ -234,78 +234,7 @@ or just re-run KTOWN (LATEST KDE) -If you want to install the latest KDE 5 packages from AlienBOB's ktown repository -add - PKGS_PRIORITY=( ktown ) - MIRRORPLUS['ktown']=http://alien.slackbook.org/ktown/14.2/5/ -to slackpkgplus.conf, then -# slackpkg update gpg -# slackpkg update - -To install ktown you need some attention, so please refeer to official -documentation for details: -http://alien.slackbook.org/ktown/14.2/5/ -http://alien.slackbook.org/ktown/current/5/ - -At time of writting, latest release are KDE 5_17.11 for slackware 14.2 and KDE 5_18.04 -for slackware current - -From official documentation: --- -If you have Slackware 14.2 or -current's default KDE 4.14.3 installed: - # removepkg /var/log/packages/*-4.14.3-* - # removepkg amarok - # removepkg kscreen - # removepkg kactivities - # removepkg kde-workspace - # removepkg kdeconnect-kde - # removepkg kdepim - # removepkg kdepimlibs - # removepkg kdev-python - # removepkg kdevelop-php - # removepkg kdevelop-php-docs - # removepkg libkscreen - # removepkg libmm-qt - # removepkg libnm-qt - # removepkg plasma-nm - # removepkg polkit-kde-agent-1 - # removepkg polkit-kde-kcmodules-1 - # removepkg wicd-kde - ... or instead of the above, simply run 'slackpkg remove kde'. ---- - -After that you can run - -slackpkg install ktown -slackpkg upgrade-all -slackpkg clean-system - -if you are upgrading an already installed ktown5, you may also need -slackpkg reinstall ktown -BEFORE slackpkg install ktown - - -Note that the packages to remove may change in newer version of ktown, -so I encourage to read linked documents BEFORE install it. - - -After that, you can keep the ktown KDE up-to-date by launching: -# slackpkg update -# slackpkg upgrade-all -Periodically you should re-run -# slackpkg install ktown -to be sure that newer packages are installed, and -# slackpkg clean-system -to be sure to clean removed packages. - - -To restore the Slackware KDE, remove all 'ktown' referall in config file, then launch: -# slackpkg update -# slackpkg reinstall kde -# slackpkg install kde -# slackpkg upgrade-all -# slackpkg clean-system - +KDE 5 is now included in slackware current, so you no longer need it ----- diff --git a/src/repositories.lst b/src/repositories.lst index a7cb9bf..7b9f135 100644 --- a/src/repositories.lst +++ b/src/repositories.lst @@ -1,44 +1,45 @@ -Mon Feb 17 00:34:27 CET 2020 +Sun Jan 24 21:31:35 CET 2021 url size date gpg http://mirrors.slackware.com/slackware/slackware-14.2 702459 2016/06/29 21:42:35 Slackware Linux Project -http://mirrors.slackware.com/slackware/slackware-current 737055 2020/02/16 00:01:09 Slackware Linux Project +http://mirrors.slackware.com/slackware/slackware-current 841846 2021/01/23 20:56:59 Slackware Linux Project http://mirrors.slackware.com/slackware/slackware64-14.2 704195 2016/06/29 21:49:56 Slackware Linux Project -http://mirrors.slackware.com/slackware/slackware64-current 738957 2020/02/16 00:07:07 Slackware Linux Project -http://slack.conraid.net/repository/slackware64-current-binary 6003 2020/02/10 17:20:10 Corrado Franco (Conraid) -http://slack.conraid.net/repository/slackware64-current-extra 15128 2020/02/15 17:36:28 Corrado Franco (Conraid) +http://mirrors.slackware.com/slackware/slackware64-current 844578 2021/01/23 20:58:59 Slackware Linux Project +http://slack.conraid.net/repository/slackware64-current-extra 16133 2020/10/22 11:18:05 Corrado Franco (Conraid) +http://slack.conraid.net/repository/slackware64-current-testing 6661 2020/12/06 16:59:28 Corrado Franco (Conraid) http://slakfinder.org/slackpkg+ 625 2019/01/03 12:36:29 Matteo Rossini http://slakfinder.org/slackpkg+1.7 625 2019/01/03 12:36:29 Matteo Rossini -http://slakfinder.org/slackpkg+dev 45 2019/01/03 12:28:02 Matteo Rossini -http://www.slackel.gr/repo/i486/current 705986 2020/02/15 23:41:06 Dimitris Tzemos (Slackel Creator) -http://www.slackel.gr/repo/x86_64/current 720168 2020/02/15 23:36:31 Dimitris Tzemos (Slackel Creator) -https://bear.alienbase.nl/mirrors/alien-kde/14.2/5/x86 201541 2020/02/16 16:42:30 Eric Hameleers (Alien BOB) -https://bear.alienbase.nl/mirrors/alien-kde/14.2/5/x86_64 252067 2020/02/16 16:44:29 Eric Hameleers (Alien BOB) -https://bear.alienbase.nl/mirrors/alien-kde/current/5/x86 216539 2020/02/16 16:45:13 Eric Hameleers (Alien BOB) -https://bear.alienbase.nl/mirrors/alien-kde/current/5/x86_64 217369 2020/02/16 16:46:05 Eric Hameleers (Alien BOB) -https://bear.alienbase.nl/mirrors/people/alien/multilib/14.2 144010 2020/02/16 16:49:24 Eric Hameleers (IBM Linux) -https://bear.alienbase.nl/mirrors/people/alien/multilib/current 171455 2020/02/16 16:50:51 Eric Hameleers (IBM Linux) -https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.2/x86 3753 2019/12/30 12:05:25 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.2/x86_64 3766 2019/12/30 12:05:33 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/current/x86 3753 2019/12/30 12:05:34 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/current/x86_64 3766 2019/12/30 12:05:36 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/sbrepos/14.2/x86 227484 2020/02/15 13:02:12 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/sbrepos/14.2/x86_64 231054 2020/02/15 13:03:33 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/sbrepos/current/x86 256821 2020/02/15 13:04:33 Eric Hameleers -https://bear.alienbase.nl/mirrors/people/alien/sbrepos/current/x86_64 258102 2020/02/15 13:05:33 Eric Hameleers -https://download.salixos.org/i486/14.2 537561 2020/02/15 15:18:59 Salix Admin (The Bonsai OS) -https://download.salixos.org/i486/extra-14.2 1923895 2020/02/03 01:07:15 Salix Admin (The Bonsai OS) -https://download.salixos.org/x86_64/14.2 542607 2020/02/15 15:19:11 Salix Admin (The Bonsai OS) -https://download.salixos.org/x86_64/extra-14.2 1923767 2020/02/03 01:09:00 Salix Admin (The Bonsai OS) +http://slakfinder.org/slackpkg+dev 45 2020/03/15 22:02:54 Matteo Rossini +http://www.slackel.gr/repo/i486/current 660466 2021/01/24 07:28:55 Dimitris Tzemos (Slackel Creator) +http://www.slackel.gr/repo/x86_64/current 703771 2021/01/24 07:29:19 Dimitris Tzemos (Slackel Creator) +https://alien.slackbook.org/ktown 5061 2020/12/08 17:59:06 Eric Hameleers (Alien BOB) +https://bear.alienbase.nl/mirrors/alien-kde/current/5/x86 528 2020/12/27 14:41:14 Eric Hameleers (Alien BOB) +https://bear.alienbase.nl/mirrors/alien-kde/current/5/x86_64 530 2020/12/27 14:41:13 Eric Hameleers (Alien BOB) +https://bear.alienbase.nl/mirrors/people/alien/multilib/14.2 144621 2021/01/20 08:25:16 Eric Hameleers (IBM Linux) +https://bear.alienbase.nl/mirrors/people/alien/multilib/current 188380 2021/01/20 08:26:38 Eric Hameleers (IBM Linux) +https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.2/x86 3756 2020/11/17 14:58:20 Eric Hameleers +https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/14.2/x86_64 3769 2020/11/17 14:58:27 Eric Hameleers +https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/current/x86 3756 2020/11/17 14:58:28 Eric Hameleers +https://bear.alienbase.nl/mirrors/people/alien/restricted_sbrepos/current/x86_64 3769 2020/11/17 14:58:31 Eric Hameleers +https://bear.alienbase.nl/mirrors/people/alien/sbrepos/14.2/x86 230327 2021/01/21 19:33:08 Eric Hameleers +https://bear.alienbase.nl/mirrors/people/alien/sbrepos/14.2/x86_64 230636 2021/01/21 19:34:43 Eric Hameleers +https://bear.alienbase.nl/mirrors/people/alien/sbrepos/current/x86 295233 2021/01/21 19:35:53 Eric Hameleers +https://bear.alienbase.nl/mirrors/people/alien/sbrepos/current/x86_64 296081 2021/01/21 19:36:59 Eric Hameleers +https://download.salixos.org/i486/14.2 541269 2021/01/22 00:26:08 Salix Admin (The Bonsai OS) +https://download.salixos.org/i486/15.0 85942 2021/01/10 23:41:49 no +https://download.salixos.org/i486/extra-14.2 1922858 2020/12/23 23:29:27 Salix Admin (The Bonsai OS) +https://download.salixos.org/x86_64/14.2 547056 2021/01/22 00:27:18 Salix Admin (The Bonsai OS) +https://download.salixos.org/x86_64/15.0 87104 2021/01/10 23:42:03 no +https://download.salixos.org/x86_64/extra-14.2 1922728 2020/12/23 23:30:51 Salix Admin (The Bonsai OS) https://packages.slackonly.com/pub/packages/14.2-x86 4525711 2017/08/07 00:38:53 Panagiotis Nikolaou (slackware user) -https://packages.slackonly.com/pub/packages/14.2-x86_64 5007403 2020/01/28 08:33:42 Panagiotis Nikolaou (slackware user) +https://packages.slackonly.com/pub/packages/14.2-x86_64 5078675 2020/04/28 00:56:41 Panagiotis Nikolaou (slackware user) https://packages.slackonly.com/pub/packages/current-x86 2795351 2017/05/08 05:25:15 Panagiotis Nikolaou (slackware user) https://packages.slackonly.com/pub/packages/current-x86_64 3215041 2017/09/11 20:00:50 Panagiotis Nikolaou (slackware user) https://rlworkman.net/pkgs/14.2 53979 2017/12/22 09:39:05 Robby Workman -https://rlworkman.net/pkgs/current 38965 2020/02/09 03:23:55 Robby Workman +https://rlworkman.net/pkgs/current 45 2020/12/28 08:05:02 Robby Workman https://slackware.uk/csb/14.2/x86 29003 2017/12/09 20:21:22 Willy Sudiarto Raharjo https://slackware.uk/csb/14.2/x86_64 28392 2017/12/09 20:21:12 Willy Sudiarto Raharjo -https://slackware.uk/csb/current/x86_64 24859 2020/01/14 10:05:48 Willy Sudiarto Raharjo +https://slackware.uk/csb/current/x86_64 20674 2021/01/15 04:04:20 Willy Sudiarto Raharjo https://slackware.uk/microlinux/desktop-14.2-32bit 151132 2017/04/27 16:16:44 Niki Kovacs https://slackware.uk/microlinux/desktop-14.2-64bit 151985 2017/04/27 16:16:54 Niki Kovacs https://slackware.uk/microlinux/extras-14.2-32bit 13626 2017/02/20 19:56:17 Niki Kovacs @@ -49,13 +50,12 @@ https://slackware.uk/msb/14.2/1.18/x86 https://slackware.uk/msb/14.2/1.18/x86_64 30364 2018/05/22 17:28:40 MATE SlackBuilds https://slackware.uk/msb/14.2/latest/x86 30258 2018/05/22 17:28:29 MATE SlackBuilds https://slackware.uk/msb/14.2/latest/x86_64 30364 2018/05/22 17:28:40 MATE SlackBuilds -https://slackware.uk/msb/current/1.22/x86_64 28209 2020/01/01 13:54:39 MATE SlackBuilds -https://slackware.uk/msb/current/latest/x86_64 28209 2020/01/01 13:54:39 MATE SlackBuilds -https://slackware.uk/slint/i586/slint-14.2 41431 2020/02/12 11:56:52 Didier Spaier -https://slackware.uk/slint/x86_64/slint-14.2 42223 2020/02/12 11:57:02 Didier Spaier -https://slackware.uk/slint/x86_64/slint-14.2.1 686882 2020/02/12 11:56:25 Didier Spaier -https://slackware.uk/slint/x86_64/slint-testing 686882 2020/02/12 11:56:25 Didier Spaier -https://slackware.uk/slint/x86_64/slint-wip 3312 2020/02/12 11:57:03 Didier Spaier +https://slackware.uk/msb/current/1.24/x86_64 27077 2020/12/10 17:38:56 MATE SlackBuilds +https://slackware.uk/msb/current/latest/x86_64 27077 2020/12/10 17:38:56 MATE SlackBuilds +https://slackware.uk/slint/i586/slint-14.2 40483 2021/01/23 18:41:13 Didier Spaier +https://slackware.uk/slint/x86_64/slint-14.2 41273 2021/01/23 18:41:15 Didier Spaier +https://slackware.uk/slint/x86_64/slint-14.2.1 718839 2021/01/23 18:40:49 Didier Spaier +https://slackware.uk/slint/x86_64/slint-wip 3312 2021/01/23 18:41:16 Didier Spaier https://slackware.uk/studioware/14.2 112985 2018/01/13 03:11:17 Studioware https://slacky.eu/repository/slackware-14.2 28134 2020/01/31 01:13:00 Slacky.eu packagers (packages by Slacky.eu) https://slacky.eu/repository/slackware64-14.2 42698 2020/01/31 05:29:10 Slacky.eu packagers (packages by Slacky.eu) diff --git a/src/repositories.txt b/src/repositories.txt index f4b81f0..4368358 100644 --- a/src/repositories.txt +++ b/src/repositories.txt @@ -9,16 +9,16 @@ Supported Repositories: > mleddesktop: https://slackware.uk/microlinux/desktop-{14.2}-{32,64}bit/ > mledextras: https://slackware.uk/microlinux/extras-{14.2}-{32,64}bit/ > mles: https://slackware.uk/microlinux/server-{14.2}-{32,64}bit/ -> msb: https://slackware.uk/msb/{14.2,current}/{1.18,1.22,latest}/{x86,x86_64}/ +> msb: https://slackware.uk/msb/{14.2,current}/{1.18,1.24,latest}/{x86,x86_64}/ > csb: https://slackware.uk/csb/{14.2,current}/{x86,x86_64}/ -> slackers: http://slack.conraid.net/repository/slackware64-current{-binary,-extra}/ +> slackers: http://slack.conraid.net/repository/slackware64-current{-testing,-extra}/ > studioware: https://slackware.uk/studioware/{14.2} > slackonly: https://packages.slackonly.com/pub/packages/{14.2,current}-{x86,x86_64}/ > rlworkman: https://rlworkman.net/pkgs/{14.2,current}/ > slackel: http://www.slackel.gr/repo/{i486,x86_64}/current/ > slint: https://slackware.uk/slint/{i586,x86_64}/slint-{14.2,14.2.1,testing,wip}/ -> salixos: https://download.salixos.org/{i486,x86_64}/{14.2}/ -> salixextra: https://download.salixos.org/{i486,x86_64}/extra-{14.2}/ +> salixos: https://download.salixos.org/{i486,x86_64}/{14.2,15.0}/ +> salixextra: https://download.salixos.org/{i486,x86_64}/extra-{14.2,15.0}/ salixos partially supports GPG. This repository contains the .asc file for CHECKSUMS.md5, so the 'update' process works with CHECKGPG=on and repository authenticity @@ -39,30 +39,12 @@ Some specific notes: after run "slackpkg upgrade-all" * ktown: - You need to put 'ktown' in PKGS_PRIORITY - Periodically you should run "slackpkg install ktown" after run "slackpkg upgrade-all" - after install you need to do some postinstall operation, see - http://alien.slackbook.org/ktown/14.2/latest/ (kde5) - If you have Slackware 14.2 or -current's default KDE 4.14.3 installed: - # removepkg /var/log/packages/*-4.14.3-* - # removepkg libkscreen - # removepkg kscreen - # removepkg kactivities - # removepkg kde-workspace - # removepkg libmm-qt - # removepkg libnm-qt - # removepkg plasma-nm - # removepkg polkit-kde-agent-1 - # removepkg polkit-kde-kcmodules-1 - # removepkg kdeconnect-kde - # removepkg kdepim - # removepkg kdepimlibs - # removepkg kdev-python - # removepkg kdevelop-php - # removepkg kdevelop-php-docs - ..or instead of the above, simply '# slackpkg remove kde' and de-select - the packages you want to keep (amarok, etc). - + You no longer need ktown since it was included on slackware current. + However from https://alien.slackbook.org/ktown/ documentation + Here, you will find packages and sources for KDE which are + either meant for beta testing, or have not yet been added to + slackware-current (but could be added in the near future). + So please read official documentation before use it. Please read /usr/doc/slackpkg+-*/README for more details diff --git a/src/slackpkgplus.conf.5 b/src/slackpkgplus.conf.5 index 2111bc2..f80fa08 100644 --- a/src/slackpkgplus.conf.5 +++ b/src/slackpkgplus.conf.5 @@ -174,10 +174,10 @@ Also, if a package is also present in the official Slackware repositories, this The variable \fB\%PKGS_PRIORITY\fP is similar to \fB\%REPOPLUS\fP but allows a more widespread choice of the order of research both at the repository level and at individual packet level. Moreover the packages in the repositories configured in this variable can be installed even if present in the official repositories. .in +4 -PKGS_PRIORITY=( slacky:openjdk ktown multilib ) +PKGS_PRIORITY=( slacky:openjdk multilib ) .in -In this case \fB\%slackpkg\ upgrade\-all\fP would update the package \fIopenjdk\fP from the repository \fIslacky\fP and all other packages from other reporitories. Another case where you need to use this option are the ktown (kde5 of alienbob) and multilib repositories as they have to overwrite some official Slackware packages (for ktown and multilib please read the documentation carefully). Someone prefer to fully replace the variable \%REPOPLUS with \%PKGS_PRIORITY, but if you do that please you are aware that you could upgrade Slackware official packages with those third-party, so make sure the autority of the source. +In this case \fB\%slackpkg\ upgrade\-all\fP would update the package \fIopenjdk\fP from the repository \fIslacky\fP and all other packages from other reporitories. Another case where you need to use this option it the multilib repositorie as it need to overwrite some official Slackware packages (for multilib please read the documentation carefully). You can fully replace the variable \%REPOPLUS with \%PKGS_PRIORITY, but if you do that please you are aware that you could upgrade Slackware official packages with those third-party, so make sure the autority of the source. .TP 5 \fBTAG_PRIORITY\fP diff --git a/src/slackpkgplus.conf.5.it b/src/slackpkgplus.conf.5.it index 33fcb1c..1d44b7d 100644 --- a/src/slackpkgplus.conf.5.it +++ b/src/slackpkgplus.conf.5.it @@ -174,10 +174,10 @@ Inoltre se un pacchetto La variabile \fB\%PKGS_PRIORITY\fP è simile a \fB\%REPOPLUS\fP ma consente una scelta più capillare dell'ordine di ricerca sia a livello di repository sia a livello di singolo pacchetto. Inoltre i pacchetti nei repository configurati in questa variabile possono essere installati anche se presenti nei repository ufficiali. .in +4 -PKGS_PRIORITY=( slacky:openjdk ktown multilib ) +PKGS_PRIORITY=( slacky:openjdk multilib ) .in -In questo caso \fB\%slackpkg\ upgrade\-all\fP aggiornerebbe il pacchetto \fIopenjdk\fP dal repository \fIslacky\fP mentre tutti gli altri pacchetti dagli altri reporitory. Un'altro caso in cui è necessario utilizzare questa opzione sono i repository ktown (kde5 di alienbob) e multilib in quanto devono sovrascrivere alcuni pacchetti ufficiali di slackware (per ktown e multilib leggere attentamente la documentazione). Alcuni preferiscono sostituire del tutto la variabile \%REPOPLUS con \%PKGS_PRIORITY, ma se volete farlo siate coscienti che potreste upgradare pacchetti ufficiali slackware con quelli di terze parti, quindi assicuratevi della autorevolezza della fonte. +In questo caso \fB\%slackpkg\ upgrade\-all\fP aggiornerebbe il pacchetto \fIopenjdk\fP dal repository \fIslacky\fP mentre tutti gli altri pacchetti dagli altri reporitory. Un'altro caso in cui è necessario utilizzare questa opzione è il repository multilib in quanto deve sovrascrivere alcuni pacchetti ufficiali di slackware (per multilib leggere attentamente la documentazione). E' anche possibile sostituire del tutto la variabile \%REPOPLUS con \%PKGS_PRIORITY, ma se lo fate siate coscienti che potreste upgradare pacchetti ufficiali slackware con quelli di terze parti, quindi assicuratevi della autorevolezza della fonte. .TP 5 \fBTAG_PRIORITY\fP diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index 032e143..f252992 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -1271,7 +1271,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then echo -n "Preparing list " >&2 for i in $1; do let c++ - printf "%10s\b\b\b\b\b\b\b\b\b\b" "[$c/$q]" >&2 + printf "%11s\b\b\b\b\b\b\b\b\b\b\b" "[$c/$q]" >&2 REPO=${i/:*/} #$(echo "$i" | cut -f1 -d":") PNAME=${i/*:/} #PNAME=$(echo "$i" | cut -f2- -d":") @@ -1473,7 +1473,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then if [ "$2" = "upgrade" ]; then ls -1 $ROOT/var/log/packages/ > $TMPDIR/tmplist for i in $1; do - printf "%10s\b\b\b\b\b\b\b\b\b\b" "[$c/$q]" + printf "%11s\b\b\b\b\b\b\b\b\b\b\b" "[$c/$q]" let c++ TMPONOFF=$ONOFF BASENAME=$(cutpkg $i) diff --git a/src/slackpkgplus.x86.sample b/src/slackpkgplus.x86.sample index 7459263..c272cef 100644 --- a/src/slackpkgplus.x86.sample +++ b/src/slackpkgplus.x86.sample @@ -80,9 +80,6 @@ STRICTGPG=on # if you have two reporitories to give priority you must set both in the same line #PKGS_PRIORITY=( myrepo restricted:vlc ) # -# if you want to install 'ktown' repository you must set it here -#PKGS_PRIORITY=( ktown ) -# and DO NOT MISS to read special instruction on /usr/doc/slackpkg+-*/repositories.txt # Otherwise you can try to upgrade a package from a repository that contains a package with the # same tag of the already installed package. Tipically that means to upgrade a package from the diff --git a/src/slackpkgplus.x86_64.sample b/src/slackpkgplus.x86_64.sample index 0c23583..c969bf7 100644 --- a/src/slackpkgplus.x86_64.sample +++ b/src/slackpkgplus.x86_64.sample @@ -88,17 +88,11 @@ STRICTGPG=on # if you have two reporitories to give priority you must set both in the same line #PKGS_PRIORITY=( myrepo restricted:vlc ) # -# if you want to install 'ktown' repository you must set it here -#PKGS_PRIORITY=( ktown ) -# and DO NOT MISS to read special instruction on /usr/doc/slackpkg+-*/repositories.txt # # If you want a multilib system, uncomment the multilib repository and set: #PKGS_PRIORITY=( multilib ) # # (Use /usr/doc/slackpkg+-*/setupmultilib.sh to setup a multilib configuration) -# -# For both multilib and ktown set -#PKGS_PRIORITY=( multilib ktown ) # Otherwise you can try to upgrade a package from a repository that contains a package with the # same tag of the already installed package. Tipically that means to upgrade a package from the diff --git a/src/zlookkernel.sh b/src/zlookkernel.sh index 62ddcb4..952a0fa 100755 --- a/src/zlookkernel.sh +++ b/src/zlookkernel.sh @@ -13,67 +13,108 @@ lookkernel() { NEWKERNELMD5=$(md5sum /boot/vmlinuz 2>/dev/null) - if [ "$KERNELMD5" != "$NEWKERNELMD5" ]; then - KERNEL=$(readlink /boot/vmlinuz | sed 's/.*-\([1-9]\)/\1/') - echo -e "\nYour kernel image was updated (found $KERNEL). You have to rebuild the bootloader.\nDo you want slackpkg to do it? (Y/n)" + [ "$KERNELMD5" = "$NEWKERNELMD5" ]&&return + + KERNEL=$(readlink -f /boot/vmlinuz | sed 's/.*-\([1-9]\)/\1/'| sed 's/-smp//') + + echo -e "\nYour kernel image was updated (found $KERNEL). You have to rebuild the bootloader.\nDo you want slackpkg to do it? (Y/n)" + answer + + if [ "$ANSWER" = "n" ] || [ "$ANSWER" = "N" ]; then return;fi + + zgrep -q CONFIG_EXT4_FS=y /proc/config.gz && KTYPE=huge || KTYPE=generic + zgrep -q 'CONFIG_LOCALVERSION="-smp"' /proc/config.gz && KSMP="-smp" || KSMP="" + + INITRD=/boot/initrd.gz + if [ -r /boot/initrd-tree/command_line ];then + OINITRD=$(cat /boot/initrd-tree/command_line|grep -- " -o "|sed -r 's/^.* -o *([^ ]*).*$/\1/') + INITRD=${OINITRD:-$INITRD} + fi + + if [ -r "$INITRD" ];then + echo -en "Found $INITRD; rebuilding it with:\n " + MKINITRD=$(sed -e "s/ *-k *[^ ]\+//g" -e "s/ *$/ -k $KERNEL$KSMP/" /boot/initrd-tree/command_line) + echo " $MKINITRD" + echo "Do you want continue? (Y/n)" answer if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then - INITRD=/boot/initrd.gz - if [ -e /boot/initrd-tree/command_line ];then - OINITRD=$(cat /boot/initrd-tree/command_line|grep -- " -o "|sed -r 's/^.* -o *([^ ]*).*$/\1/') - INITRD=${OINITRD:-$INITRD} - - if [ -f "$INITRD" ];then - echo -en "Found $INITRD; rebuilding it with:\n " - MKINITRD=$(sed -e "s/ *-k *[^ ]\+//g" -e "s/ *$/ -k $KERNEL/" /boot/initrd-tree/command_line) - echo " $MKINITRD" - echo "Do you want continue? (Y/n)" - answer - if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then - $MKINITRD - if [ ! -d "/boot/initrd-tree/lib/modules/$KERNEL" ];then - echo -e "\nWARNING! the initrd may failed to create\n" - echo " The initrd may failed to create." >>$TMPDIR/error.log - fi - fi - fi - fi - - - if [ -e /boot/efi/EFI/Slackware/elilo.conf ];then - echo -e "\nFound elilo. Copying files to EFI partition" - COPYDONE="" - for tocopy in vmlinuz vmlinuz-generic vmlinuz-huge `basename $INITRD`;do - if [ -e /boot/$tocopy ]&&[ -e /boot/efi/EFI/Slackware/$tocopy ]&&grep -E -q "= *$tocopy *$" /boot/efi/EFI/Slackware/elilo.conf ;then - echo "Do you want to copy $tocopy to EFI partition? (Y/n)" - answer - if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then - cp -v /boot/$tocopy /boot/efi/EFI/Slackware/$tocopy && COPYDONE="$COPYDONE $tocopy" - touch -r /boot/$tocopy /boot/efi/EFI/Slackware/$tocopy - fi - fi - done - if [ -z "$COPYDONE" ];then - echo -e "\nWARNING! no files copied. You have to fix bootloader yourself\n" - echo " No files copied to the EFI partition found. Fix it yourself" >>$TMPDIR/error.log - fi - elif [ -x /sbin/lilo ]&&[ -e /etc/lilo.conf ]; then - echo -e "\nFound lilo. Do you want to run now: /sbin/lilo ? (Y/n)" + $MKINITRD + if [ ! -d "/boot/initrd-tree/lib/modules/$KERNEL$KSMP" ];then + echo -e "\nWARNING! the initrd may failed to create\n" + echo "You may retry by using mkinitrd_command_generator.sh:" + /usr/share/mkinitrd/mkinitrd_command_generator.sh -k $KERNEL$KSMP -a "-o $INITRD" -r + echo "Do you want to retry by using mkinitrd_command_generator.sh now? (Y/n)" answer if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then - if ! /sbin/lilo -t ;then - echo "You need to fix your lilo configuration. Then press return to continue." - read + /usr/share/mkinitrd/mkinitrd_command_generator.sh -k $KERNEL$KSMP -a "-o $INITRD" -r + if [ ! -d "/boot/initrd-tree/lib/modules/$KERNEL$KSMP" ];then + echo -e "\nWARNING! the initrd may failed to create\n" + echo " The initrd may failed to create." >>$TMPDIR/error.log + if [ -e /usr/sbin/geninitrd ];then + echo " Try to run /usr/sbin/geninitrd to fix." + fi fi - /sbin/lilo -v + else + echo " The initrd may failed to create." >>$TMPDIR/error.log + if [ -e /usr/sbin/geninitrd ];then + echo " Try to run /usr/sbin/geninitrd to fix." + fi fi - elif [ -e /boot/grub ]&&[ -x /usr/sbin/grub-install ];then - echo -e "\nWARNING! Grub found but not supported by slackpkg. You have to fix it yourself\n" - echo " Grub found but not supported by slackpkg. You have to fix it yourself" >>$TMPDIR/error.log - else - echo -e "\nWARNING! slackpkg can't found your bootloader configuration. You have to fix it yourself\n" - echo " slackpkg can't found your bootloader configuration. You have to fix it yourself" >>$TMPDIR/error.log fi fi fi + + + + if [ -r /boot/efi/EFI/Slackware/elilo.conf ];then + ERRS=0 + echo -e "\nFound elilo. Do you want to copy files to EFI partition (Y/n)" + answer + if [ "$ANSWER" = "n" ] || [ "$ANSWER" = "N" ]; then return;fi + + if [ ! -r /boot/efi/EFI/Slackware/vmlinuz ] || ! grep -E -q "= *vmlinuz *$" /boot/efi/EFI/Slackware/elilo.conf || + [ ! -r /boot/efi/EFI/Slackware/elilo.efi ] || [ ! -r /boot/elilo-x86_64.efi ] || [ ! -r /boot/vmlinuz-$KTYPE$SMP ];then + echo -e "\nWARNING! this is a non standard or invalid EFI installation\n Try to run /usr/sbin/eliloconfig yourself to fix\n" + echo -e " Unable to fix EFI bootloader" >>$TMPDIR/error.log + return + fi + if grep -E -q "initrd *=" /boot/efi/EFI/Slackware/elilo.conf;then + if ! grep -E -q "initrd *= *initrd.gz *$" /boot/efi/EFI/Slackware/elilo.conf || [ $INITRD != /boot/initrd.gz ] || + [ ! -e /boot/efi/EFI/Slackware/initrd.gz ] || ! grep -E -q "= *initrd.gz *$" /boot/efi/EFI/Slackware/elilo.conf || + [ ! -r /boot/initrd.gz ];then + echo -e "\nWARNING! this is a non standard or invalid EFI installation" + echo -e " Try to regenerate yourself the initrd, then run /usr/sbin/eliloconfig to fix\n" + echo -e " Unable to fix EFI bootloader" >>$TMPDIR/error.log + return + fi + cp -v /boot/initrd.gz /boot/efi/EFI/Slackware/initrd.gz || ERRS=1 + touch -r /boot/initrd.gz /boot/efi/EFI/Slackware/initrd.gz + fi + cp -v /boot/vmlinuz-$KTYPE$SMP /boot/efi/EFI/Slackware/vmlinuz || ERRS=1 + touch -r /boot/vmlinuz-$KTYPE$SMP /boot/efi/EFI/Slackware/vmlinuz + cp -v /boot/elilo-x86_64.efi /boot/efi/EFI/Slackware/elilo.efi || ERRS=1 + touch -r /boot/elilo-x86_64.efi /boot/efi/EFI/Slackware/elilo.efi + + if [ $ERRS -ne 0 ];then + echo -e "\nWARNING! some error copying files. You have to fix bootloader yourself\n Try to run /usr/sbin/eliloconfig yourself to fix" + echo -e "Errors copying files to EFI partition. Fix it yourself" >>$TMPDIR/error.log + return + fi + elif [ -x /sbin/lilo ]&&[ -e /etc/lilo.conf ]; then + echo -e "\nFound lilo. Do you want to run now: /sbin/lilo ? (Y/n)" + answer + if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then + if ! /sbin/lilo -t ;then + echo "You need to fix your lilo configuration. Then press return to continue." + read + fi + /sbin/lilo -v + fi + elif [ -d /boot/grub ]&&[ -x /usr/sbin/grub-install ];then + echo -e "\nWARNING! Grub found but not supported by slackpkg. You have to fix it yourself\n" + echo " Grub found but not supported by slackpkg. You have to fix it yourself" >>$TMPDIR/error.log + else + echo -e "\nWARNING! slackpkg can't found your bootloader configuration. You have to fix it yourself\n" + echo " slackpkg can't found your bootloader configuration. You have to fix it yourself" >>$TMPDIR/error.log + fi }