This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via fd9a531f716312b2bdab35f92c6aad5add21d563 (commit) via 05b2d72588aa0ae8d1a1b521788912f0b1702b47 (commit) via c22976907e44d682c916bed600dcd396907c2254 (commit) from 779706b5f8f0025690dec3f8bf32f32deb9f7e05 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit fd9a531f716312b2bdab35f92c6aad5add21d563 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jun 6 14:01:43 2018 +0100
Bump version to 2.21
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 05b2d72588aa0ae8d1a1b521788912f0b1702b47 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jun 6 14:01:18 2018 +0100
core121: Create updater
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c22976907e44d682c916bed600dcd396907c2254 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Jun 1 18:40:07 2018 +0200
tar: Update to 1.30 (V3)
For details see: https://www.gnu.org/software/tar/
Since new 'tar' has changes in commandline option parsing, it was necessary to adjust 'lfs/Config, 'lfs/cdrom' and 'lfs/core-updates' (thanks to Marcel for diffs and Michael for corrections).
I have tried to make only the most necessary changes.
As always, please check.
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/121/filelists/acpid | 1 + .../{oldcore/114 => core/121}/filelists/apache2 | 0 .../{oldcore/114 => core/121}/filelists/apr | 0 .../{oldcore/114 => core/121}/filelists/aprutil | 0 config/rootfiles/core/121/filelists/armv5tel/files | 1 + .../121/filelists/armv5tel/linux-initrd-kirkwood | 1 + .../core/121/filelists/armv5tel/linux-initrd-multi | 1 + .../core/121/filelists/armv5tel/linux-initrd-rpi | 1 + .../121}/filelists/armv5tel/linux-kirkwood | 0 .../121}/filelists/armv5tel/linux-multi | 0 .../100 => core/121}/filelists/armv5tel/linux-rpi | 0 .../121}/filelists/armv5tel/rpi-firmware | 0 .../66 => core/121}/filelists/armv5tel/u-boot | 0 .../core/121/filelists/armv5tel/u-boot-kirkwood | 1 + .../core/121/filelists/armv5tel/u-boot-mkimage | 1 + .../{oldcore/77 => core/121}/filelists/beep | 0 .../92 => core/121}/filelists/ca-certificates | 0 .../{oldcore/112 => core/121}/filelists/cmake | 0 .../{oldcore/46 => core/121}/filelists/crda | 0 .../{oldcore/111 => core/121}/filelists/dhcp | 0 config/rootfiles/core/121/filelists/files | 14 +++++++ .../{oldcore/106 => core/121}/filelists/flex | 0 .../{oldcore/100 => core/121}/filelists/i586/grub | 0 .../core/121/filelists/i586/intel-microcode | 1 + .../{oldcore/100 => core/121}/filelists/i586/linux | 0 .../100 => core/121}/filelists/i586/linux-initrd | 0 .../{oldcore/28 => core/121}/filelists/iw | 0 .../{oldcore/71 => core/121}/filelists/jwhois | 0 .../28 => core/121}/filelists/linux-firmware | 0 .../87 => core/121}/filelists/multipath-tools | 0 .../{oldcore/100 => core/121}/filelists/openssl | 0 .../{oldcore/77 => core/121}/filelists/rng-tools | 0 .../{oldcore/28 => core/121}/filelists/tar | 0 .../{oldcore/106 => core/121}/filelists/unbound | 0 .../{oldcore/104 => core/121}/filelists/wget | 0 .../100 => core/121}/filelists/x86_64/grub | 0 .../core/121/filelists/x86_64/intel-microcode | 1 + .../100 => core/121}/filelists/x86_64/linux | 0 .../100 => core/121}/filelists/x86_64/linux-initrd | 0 config/rootfiles/core/121/filelists/xr819-firmware | 1 + .../90 => core/121}/filelists/xtables-addons | 0 .../{oldcore/100 => core/121}/filelists/xz | 0 config/rootfiles/core/121/update.sh | 45 ++++++++++++++++++++++ lfs/Config | 6 +-- lfs/cdrom | 5 +-- lfs/core-updates | 7 ++-- lfs/tar | 6 +-- make.sh | 2 +- 48 files changed, 80 insertions(+), 15 deletions(-) create mode 120000 config/rootfiles/core/121/filelists/acpid copy config/rootfiles/{oldcore/114 => core/121}/filelists/apache2 (100%) copy config/rootfiles/{oldcore/114 => core/121}/filelists/apr (100%) copy config/rootfiles/{oldcore/114 => core/121}/filelists/aprutil (100%) create mode 100644 config/rootfiles/core/121/filelists/armv5tel/files create mode 120000 config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood create mode 120000 config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi create mode 120000 config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi copy config/rootfiles/{oldcore/100 => core/121}/filelists/armv5tel/linux-kirkwood (100%) copy config/rootfiles/{oldcore/100 => core/121}/filelists/armv5tel/linux-multi (100%) copy config/rootfiles/{oldcore/100 => core/121}/filelists/armv5tel/linux-rpi (100%) copy config/rootfiles/{oldcore/66 => core/121}/filelists/armv5tel/rpi-firmware (100%) copy config/rootfiles/{oldcore/66 => core/121}/filelists/armv5tel/u-boot (100%) create mode 120000 config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood create mode 120000 config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage copy config/rootfiles/{oldcore/77 => core/121}/filelists/beep (100%) copy config/rootfiles/{oldcore/92 => core/121}/filelists/ca-certificates (100%) copy config/rootfiles/{oldcore/112 => core/121}/filelists/cmake (100%) copy config/rootfiles/{oldcore/46 => core/121}/filelists/crda (100%) copy config/rootfiles/{oldcore/111 => core/121}/filelists/dhcp (100%) copy config/rootfiles/{oldcore/106 => core/121}/filelists/flex (100%) copy config/rootfiles/{oldcore/100 => core/121}/filelists/i586/grub (100%) create mode 120000 config/rootfiles/core/121/filelists/i586/intel-microcode copy config/rootfiles/{oldcore/100 => core/121}/filelists/i586/linux (100%) copy config/rootfiles/{oldcore/100 => core/121}/filelists/i586/linux-initrd (100%) copy config/rootfiles/{oldcore/28 => core/121}/filelists/iw (100%) copy config/rootfiles/{oldcore/71 => core/121}/filelists/jwhois (100%) copy config/rootfiles/{oldcore/28 => core/121}/filelists/linux-firmware (100%) copy config/rootfiles/{oldcore/87 => core/121}/filelists/multipath-tools (100%) copy config/rootfiles/{oldcore/100 => core/121}/filelists/openssl (100%) copy config/rootfiles/{oldcore/77 => core/121}/filelists/rng-tools (100%) copy config/rootfiles/{oldcore/28 => core/121}/filelists/tar (100%) copy config/rootfiles/{oldcore/106 => core/121}/filelists/unbound (100%) copy config/rootfiles/{oldcore/104 => core/121}/filelists/wget (100%) copy config/rootfiles/{oldcore/100 => core/121}/filelists/x86_64/grub (100%) create mode 120000 config/rootfiles/core/121/filelists/x86_64/intel-microcode copy config/rootfiles/{oldcore/100 => core/121}/filelists/x86_64/linux (100%) copy config/rootfiles/{oldcore/100 => core/121}/filelists/x86_64/linux-initrd (100%) create mode 120000 config/rootfiles/core/121/filelists/xr819-firmware copy config/rootfiles/{oldcore/90 => core/121}/filelists/xtables-addons (100%) copy config/rootfiles/{oldcore/100 => core/121}/filelists/xz (100%)
Difference in files: diff --git a/config/rootfiles/core/121/filelists/acpid b/config/rootfiles/core/121/filelists/acpid new file mode 120000 index 000000000..73f1b7b0d --- /dev/null +++ b/config/rootfiles/core/121/filelists/acpid @@ -0,0 +1 @@ +../../../common/acpid \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/apache2 b/config/rootfiles/core/121/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/core/121/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/apr b/config/rootfiles/core/121/filelists/apr new file mode 120000 index 000000000..87dd1974f --- /dev/null +++ b/config/rootfiles/core/121/filelists/apr @@ -0,0 +1 @@ +../../../common/apr \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/aprutil b/config/rootfiles/core/121/filelists/aprutil new file mode 120000 index 000000000..999f9f84b --- /dev/null +++ b/config/rootfiles/core/121/filelists/aprutil @@ -0,0 +1 @@ +../../../common/aprutil \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/armv5tel/files b/config/rootfiles/core/121/filelists/armv5tel/files new file mode 100644 index 000000000..d2712ba53 --- /dev/null +++ b/config/rootfiles/core/121/filelists/armv5tel/files @@ -0,0 +1 @@ +etc/rc.d/init.d/swconfig diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood new file mode 120000 index 000000000..39c5591b7 --- /dev/null +++ b/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-initrd-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi new file mode 120000 index 000000000..0b1b4530a --- /dev/null +++ b/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-initrd-multi \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi b/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi new file mode 120000 index 000000000..828106757 --- /dev/null +++ b/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-initrd-rpi \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood new file mode 120000 index 000000000..72171071e --- /dev/null +++ b/config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-multi b/config/rootfiles/core/121/filelists/armv5tel/linux-multi new file mode 120000 index 000000000..204eb4c43 --- /dev/null +++ b/config/rootfiles/core/121/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-rpi b/config/rootfiles/core/121/filelists/armv5tel/linux-rpi new file mode 120000 index 000000000..a651a498f --- /dev/null +++ b/config/rootfiles/core/121/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/armv5tel/rpi-firmware b/config/rootfiles/core/121/filelists/armv5tel/rpi-firmware new file mode 120000 index 000000000..428fdf88f --- /dev/null +++ b/config/rootfiles/core/121/filelists/armv5tel/rpi-firmware @@ -0,0 +1 @@ +../../../../common/armv5tel/rpi-firmware \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/armv5tel/u-boot b/config/rootfiles/core/121/filelists/armv5tel/u-boot new file mode 120000 index 000000000..3df31a883 --- /dev/null +++ b/config/rootfiles/core/121/filelists/armv5tel/u-boot @@ -0,0 +1 @@ +../../../../common/armv5tel/u-boot \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood b/config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood new file mode 120000 index 000000000..eebbdb14a --- /dev/null +++ b/config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/u-boot-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage b/config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage new file mode 120000 index 000000000..65fe960ae --- /dev/null +++ b/config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage @@ -0,0 +1 @@ +../../../../common/armv5tel/u-boot-mkimage \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/beep b/config/rootfiles/core/121/filelists/beep new file mode 120000 index 000000000..6db094efa --- /dev/null +++ b/config/rootfiles/core/121/filelists/beep @@ -0,0 +1 @@ +../../../common/beep \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/ca-certificates b/config/rootfiles/core/121/filelists/ca-certificates new file mode 120000 index 000000000..320fea8f4 --- /dev/null +++ b/config/rootfiles/core/121/filelists/ca-certificates @@ -0,0 +1 @@ +../../../common/ca-certificates \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/cmake b/config/rootfiles/core/121/filelists/cmake new file mode 120000 index 000000000..491d25f72 --- /dev/null +++ b/config/rootfiles/core/121/filelists/cmake @@ -0,0 +1 @@ +../../../common/cmake \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/crda b/config/rootfiles/core/121/filelists/crda new file mode 120000 index 000000000..d68c46e55 --- /dev/null +++ b/config/rootfiles/core/121/filelists/crda @@ -0,0 +1 @@ +../../../common/crda \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/dhcp b/config/rootfiles/core/121/filelists/dhcp new file mode 120000 index 000000000..32d8da443 --- /dev/null +++ b/config/rootfiles/core/121/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/files b/config/rootfiles/core/121/filelists/files index fc07ad7e9..a0bb9423c 100644 --- a/config/rootfiles/core/121/filelists/files +++ b/config/rootfiles/core/121/filelists/files @@ -1,6 +1,20 @@ etc/system-release etc/issue +etc/rc.d/init.d/acpid +etc/rc.d/init.d/collectd +etc/rc.d/init.d/firstsetup +etc/rc.d/init.d/leds +etc/rc.d/init.d/partresize +etc/rc.d/init.d/rngd +etc/rc.d/rc0.d/K87acpid +etc/rc.d/rc3.d/S12acpid +etc/rc.d/rc6.d/K87acpid etc/ssl/certs/ca-bundle.crt +srv/web/ipfire/cgi-bin/entropy.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/remote.cgi +usr/lib/firewall/firewall-lib.pl var/ipfire/langs +var/ipfire/qos/bin/makeqosscripts.pl diff --git a/config/rootfiles/core/121/filelists/flex b/config/rootfiles/core/121/filelists/flex new file mode 120000 index 000000000..feb0390ff --- /dev/null +++ b/config/rootfiles/core/121/filelists/flex @@ -0,0 +1 @@ +../../../common/flex \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/i586/grub b/config/rootfiles/core/121/filelists/i586/grub new file mode 120000 index 000000000..feb236a22 --- /dev/null +++ b/config/rootfiles/core/121/filelists/i586/grub @@ -0,0 +1 @@ +../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/i586/intel-microcode b/config/rootfiles/core/121/filelists/i586/intel-microcode new file mode 120000 index 000000000..f03e84778 --- /dev/null +++ b/config/rootfiles/core/121/filelists/i586/intel-microcode @@ -0,0 +1 @@ +../../../../common/i586/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/i586/linux b/config/rootfiles/core/121/filelists/i586/linux new file mode 120000 index 000000000..693ec4bbf --- /dev/null +++ b/config/rootfiles/core/121/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/i586/linux-initrd b/config/rootfiles/core/121/filelists/i586/linux-initrd new file mode 120000 index 000000000..32a03e6a9 --- /dev/null +++ b/config/rootfiles/core/121/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/iw b/config/rootfiles/core/121/filelists/iw new file mode 120000 index 000000000..7c58a2089 --- /dev/null +++ b/config/rootfiles/core/121/filelists/iw @@ -0,0 +1 @@ +../../../common/iw \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/jwhois b/config/rootfiles/core/121/filelists/jwhois new file mode 120000 index 000000000..b984a7f3f --- /dev/null +++ b/config/rootfiles/core/121/filelists/jwhois @@ -0,0 +1 @@ +../../../common/jwhois \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/linux-firmware b/config/rootfiles/core/121/filelists/linux-firmware new file mode 120000 index 000000000..4bf91bca9 --- /dev/null +++ b/config/rootfiles/core/121/filelists/linux-firmware @@ -0,0 +1 @@ +../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/multipath-tools b/config/rootfiles/core/121/filelists/multipath-tools new file mode 120000 index 000000000..9ff63237c --- /dev/null +++ b/config/rootfiles/core/121/filelists/multipath-tools @@ -0,0 +1 @@ +../../../common/multipath-tools \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/openssl b/config/rootfiles/core/121/filelists/openssl new file mode 120000 index 000000000..e011a9266 --- /dev/null +++ b/config/rootfiles/core/121/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/rng-tools b/config/rootfiles/core/121/filelists/rng-tools new file mode 120000 index 000000000..a7853e41b --- /dev/null +++ b/config/rootfiles/core/121/filelists/rng-tools @@ -0,0 +1 @@ +../../../common/rng-tools \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/tar b/config/rootfiles/core/121/filelists/tar new file mode 120000 index 000000000..3e585d2eb --- /dev/null +++ b/config/rootfiles/core/121/filelists/tar @@ -0,0 +1 @@ +../../../common/tar \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/unbound b/config/rootfiles/core/121/filelists/unbound new file mode 120000 index 000000000..66adf0924 --- /dev/null +++ b/config/rootfiles/core/121/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/wget b/config/rootfiles/core/121/filelists/wget new file mode 120000 index 000000000..fcb57dfec --- /dev/null +++ b/config/rootfiles/core/121/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/x86_64/grub b/config/rootfiles/core/121/filelists/x86_64/grub new file mode 120000 index 000000000..78d3bd784 --- /dev/null +++ b/config/rootfiles/core/121/filelists/x86_64/grub @@ -0,0 +1 @@ +../../../../common/x86_64/grub \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/x86_64/intel-microcode b/config/rootfiles/core/121/filelists/x86_64/intel-microcode new file mode 120000 index 000000000..d5ac074e2 --- /dev/null +++ b/config/rootfiles/core/121/filelists/x86_64/intel-microcode @@ -0,0 +1 @@ +../../../../common/x86_64/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/x86_64/linux b/config/rootfiles/core/121/filelists/x86_64/linux new file mode 120000 index 000000000..0615b5b9a --- /dev/null +++ b/config/rootfiles/core/121/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/x86_64/linux-initrd b/config/rootfiles/core/121/filelists/x86_64/linux-initrd new file mode 120000 index 000000000..1b9fff70f --- /dev/null +++ b/config/rootfiles/core/121/filelists/x86_64/linux-initrd @@ -0,0 +1 @@ +../../../../common/x86_64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/xr819-firmware b/config/rootfiles/core/121/filelists/xr819-firmware new file mode 120000 index 000000000..8b746aea4 --- /dev/null +++ b/config/rootfiles/core/121/filelists/xr819-firmware @@ -0,0 +1 @@ +../../../common/xr819-firmware \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/xtables-addons b/config/rootfiles/core/121/filelists/xtables-addons new file mode 120000 index 000000000..2e24c4298 --- /dev/null +++ b/config/rootfiles/core/121/filelists/xtables-addons @@ -0,0 +1 @@ +../../../common/xtables-addons \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/xz b/config/rootfiles/core/121/filelists/xz new file mode 120000 index 000000000..734e926c7 --- /dev/null +++ b/config/rootfiles/core/121/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/121/update.sh b/config/rootfiles/core/121/update.sh index 87d5f6ebd..76994d922 100644 --- a/config/rootfiles/core/121/update.sh +++ b/config/rootfiles/core/121/update.sh @@ -26,11 +26,56 @@
core=121
+exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + # Remove old core updates from pakfire cache to save space... for (( i=1; i<=$core; i++ )); do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done
+# This update cannot be applied on ARM +case "$(uname -a)" in + arm*) + exit_with_error "ERROR: Cannot update on ARM. Please re-install." 1 + ;; +esac + +# Do some sanity checks. +case $(uname -r) in + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +# Remove the old kernel +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/zImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + # Stop services
# Extract files diff --git a/lfs/Config b/lfs/Config index 76f732de8..82bdde066 100644 --- a/lfs/Config +++ b/lfs/Config @@ -205,11 +205,9 @@ define PAK sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e 's/MACHINE/$(BUILD_ARCH)/g' -i /install/packages/package/ROOTFILES sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh chmod 755 /install/packages/package/{{,un}install,update}.sh - cd / && tar cf /install/packages/package/files.tmp --files-from=/install/packages/package/ROOTFILES --exclude='#*' \ - -p --numeric-owner + cd / && tar cfp /install/packages/package/files.tmp --numeric-owner --exclude='#*' --files-from=/install/packages/package/ROOTFILES # Double tar to remove double files - tar xf /install/packages/package/files.tmp -C /install/packages/package/tmp/ \ - -p --numeric-owner + tar xfp /install/packages/package/files.tmp --numeric-owner -C /install/packages/package/tmp/ rm -f /install/packages/package/files.tmp cd /install/packages/package/tmp/ && tar cf - -p --numeric-owner * | xz $(XZ_OPT) > /install/packages/package/files.tar.xz rm -r /install/packages/package/tmp diff --git a/lfs/cdrom b/lfs/cdrom index 00f185d81..6382034b5 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -65,9 +65,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Compress root filesystem # Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES - tar -c -C / --files-from=/tmp/ROOTFILES \ - -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \ - --exclude='proc/*' --exclude='tmp/ROOTFILES' + tar -c --exclude='#*' --exclude='proc/*' --exclude='dev/pts/*' --exclude='tmp/ROOTFILES' \ + -C / --files-from=/tmp/ROOTFILES -f /$(SNAME).tar rm -f /tmp/ROOTFILES tar -x -C /tmp -f /$(SNAME).tar rm -f /$(SNAME).tar diff --git a/lfs/core-updates b/lfs/core-updates index d34926967..3d12d40b1 100644 --- a/lfs/core-updates +++ b/lfs/core-updates @@ -72,10 +72,9 @@ core/%: sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
#Remove doubled files with tar/untar/tar to save space - tar -c -C / --files-from=/tmp/ROOTFILES \ - -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \ - --exclude='proc/*' --exclude='tmp/ROOTFILES' \ - --exclude-from=$(DIR_SRC)/config/rootfiles/$@/exclude + tar -c --exclude='proc/*' --exclude='tmp/ROOTFILES' --exclude='#*' --exclude='dev/pts/*' \ + --exclude-from=$(DIR_SRC)/config/rootfiles/$@/exclude \ + -C / --files-from=/tmp/ROOTFILES -f /$(SNAME).tar mv -f /tmp/ROOTFILES /install/packages/package/ROOTFILES tar -p --numeric-owner -x -C /tmp -f /$(SNAME).tar rm -f /$(SNAME).tar diff --git a/lfs/tar b/lfs/tar index 6a949a003..4e914b535 100644 --- a/lfs/tar +++ b/lfs/tar @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2018 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 1.28 +VER = 1.30
THISAPP = tar-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8f32b2bc1ed7ddf4cf4e4a39711341b0 +$(DL_FILE)_MD5 = 8404e4c1fc5a3000228ab2b8ad674a65
install : $(TARGET)
diff --git a/make.sh b/make.sh index aaaeb751e..dbe129745 100755 --- a/make.sh +++ b/make.sh @@ -24,7 +24,7 @@
NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.19" # Version number +VERSION="2.21" # Version number CORE="121" # Core Level (Filename) PAKFIRE_CORE="120" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
hooks/post-receive -- IPFire 2.x development tree