wok rev 20138
Up firmware (20171030)
line diff
1.1 --- a/firmware-atheros/receipt Mon Oct 30 13:48:15 2017 +0100 1.2 +++ b/firmware-atheros/receipt Wed Nov 01 05:04:12 2017 -0400 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="firmware-atheros" 1.7 -VERSION="20141201" 1.8 +VERSION="20171030" 1.9 CATEGORY="non-free" 1.10 SHORT_DESC="Firmware files for atheros modules." 1.11 MAINTAINER="mojo@slitaz.org" 1.12 @@ -18,5 +18,5 @@ 1.13 cp -a $install/lib/firmware/ar*.bin $fs/lib/firmware 1.14 cp -a $install/lib/firmware/ath3*.fw $fs/lib/firmware 1.15 cp -a $install/lib/firmware/htc_*.fw $fs/lib/firmware 1.16 -cp -a $install/share/licenses/LICENCE.atheros_firmware $fs/usr/share/licenses 1.17 +cp -a $install/usr/share/licenses/LICENCE.atheros_firmware $fs/usr/share/licenses 1.18 }
2.1 --- a/firmware-iwlwifi-100/receipt Mon Oct 30 13:48:15 2017 +0100 2.2 +++ b/firmware-iwlwifi-100/receipt Wed Nov 01 05:04:12 2017 -0400 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="firmware-iwlwifi-100" 2.7 -VERSION="20141201" 2.8 +VERSION="20171030" 2.9 CATEGORY="non-free" 2.10 SHORT_DESC="Firmware files for iwlwifi 100" 2.11 MAINTAINER="al.bobylev@gmail.com" 2.12 @@ -17,5 +17,5 @@ 2.13 { 2.14 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 2.15 cp -a $install/lib/firmware/iwlwifi-100-*.ucode $fs/lib/firmware 2.16 - cp -a $install/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 2.17 + cp -a $install/usr/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 2.18 }
3.1 --- a/firmware-iwlwifi-1000/receipt Mon Oct 30 13:48:15 2017 +0100 3.2 +++ b/firmware-iwlwifi-1000/receipt Wed Nov 01 05:04:12 2017 -0400 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="firmware-iwlwifi-1000" 3.7 -VERSION="20141201" 3.8 +VERSION="20171030" 3.9 CATEGORY="non-free" 3.10 SHORT_DESC="Firmware files for iwlwifi 1000" 3.11 MAINTAINER="slaxemulator@gmail.com" 3.12 @@ -17,6 +17,6 @@ 3.13 { 3.14 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 3.15 cp -a $install/lib/firmware/iwlwifi-1000*.ucode $fs/lib/firmware 3.16 - cp -a $install/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 3.17 + cp -a $install/usr/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 3.18 } 3.19
4.1 --- a/firmware-iwlwifi-105/receipt Mon Oct 30 13:48:15 2017 +0100 4.2 +++ b/firmware-iwlwifi-105/receipt Wed Nov 01 05:04:12 2017 -0400 4.3 @@ -1,7 +1,7 @@ 4.4 # SliTaz package receipt. 4.5 4.6 PACKAGE="firmware-iwlwifi-105" 4.7 -VERSION="20141201" 4.8 +VERSION="20171030" 4.9 CATEGORY="non-free" 4.10 SHORT_DESC="Firmware files for iwlwifi 105" 4.11 MAINTAINER="al.bobylev@gmail.com" 4.12 @@ -17,5 +17,5 @@ 4.13 { 4.14 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 4.15 cp -a $install/lib/firmware/iwlwifi-105-*.ucode $fs/lib/firmware 4.16 - cp -a $install/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 4.17 + cp -a $install/usr/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 4.18 }
5.1 --- a/firmware-iwlwifi-135/receipt Mon Oct 30 13:48:15 2017 +0100 5.2 +++ b/firmware-iwlwifi-135/receipt Wed Nov 01 05:04:12 2017 -0400 5.3 @@ -1,7 +1,7 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="firmware-iwlwifi-135" 5.7 -VERSION="20141201" 5.8 +VERSION="20171030" 5.9 CATEGORY="non-free" 5.10 SHORT_DESC="Firmware files for iwlwifi 135" 5.11 MAINTAINER="al.bobylev@gmail.com" 5.12 @@ -17,5 +17,5 @@ 5.13 { 5.14 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 5.15 cp -a $install/lib/firmware/iwlwifi-135-*.ucode $fs/lib/firmware 5.16 - cp -a $install/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 5.17 + cp -a $install/usr/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 5.18 }
6.1 --- a/firmware-iwlwifi-2000/receipt Mon Oct 30 13:48:15 2017 +0100 6.2 +++ b/firmware-iwlwifi-2000/receipt Wed Nov 01 05:04:12 2017 -0400 6.3 @@ -1,7 +1,7 @@ 6.4 # SliTaz package receipt. 6.5 6.6 PACKAGE="firmware-iwlwifi-2000" 6.7 -VERSION="20141201" 6.8 +VERSION="20171030" 6.9 CATEGORY="non-free" 6.10 SHORT_DESC="Firmware files for iwlwifi 2000" 6.11 MAINTAINER="slaxemulator@gmail.com" 6.12 @@ -17,6 +17,6 @@ 6.13 { 6.14 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 6.15 cp -a $install/lib/firmware/iwlwifi-2000*.ucode $fs/lib/firmware 6.16 - cp -a $install/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 6.17 + cp -a $install/usr/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 6.18 } 6.19
7.1 --- a/firmware-iwlwifi-2030/receipt Mon Oct 30 13:48:15 2017 +0100 7.2 +++ b/firmware-iwlwifi-2030/receipt Wed Nov 01 05:04:12 2017 -0400 7.3 @@ -1,7 +1,7 @@ 7.4 # SliTaz package receipt. 7.5 7.6 PACKAGE="firmware-iwlwifi-2030" 7.7 -VERSION="20141201" 7.8 +VERSION="20171030" 7.9 CATEGORY="non-free" 7.10 SHORT_DESC="Firmware files for iwlwifi 2030" 7.11 MAINTAINER="al.bobylev@gmail.com" 7.12 @@ -17,5 +17,5 @@ 7.13 { 7.14 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 7.15 cp -a $install/lib/firmware/iwlwifi-2030-*.ucode $fs/lib/firmware 7.16 - cp -a $install/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 7.17 + cp -a $install/usr/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 7.18 }
8.1 --- a/firmware-iwlwifi-3160/receipt Mon Oct 30 13:48:15 2017 +0100 8.2 +++ b/firmware-iwlwifi-3160/receipt Wed Nov 01 05:04:12 2017 -0400 8.3 @@ -1,7 +1,7 @@ 8.4 # SliTaz package receipt. 8.5 8.6 PACKAGE="firmware-iwlwifi-3160" 8.7 -VERSION="20141201" 8.8 +VERSION="20171030" 8.9 CATEGORY="non-free" 8.10 SHORT_DESC="Firmware files for iwlwifi 3160" 8.11 MAINTAINER="al.bobylev@gmail.com" 8.12 @@ -17,5 +17,5 @@ 8.13 { 8.14 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 8.15 cp -a $install/lib/firmware/iwlwifi-3160*.ucode $fs/lib/firmware 8.16 - cp -a $install/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 8.17 + cp -a $install/usr/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 8.18 }
9.1 --- a/firmware-iwlwifi-3945/receipt Mon Oct 30 13:48:15 2017 +0100 9.2 +++ b/firmware-iwlwifi-3945/receipt Wed Nov 01 05:04:12 2017 -0400 9.3 @@ -1,7 +1,7 @@ 9.4 # SliTaz package receipt. 9.5 9.6 PACKAGE="firmware-iwlwifi-3945" 9.7 -VERSION="20141201" 9.8 +VERSION="20171030" 9.9 CATEGORY="non-free" 9.10 SHORT_DESC="Firmware files for iwlwifi 3945 (legacy)" 9.11 MAINTAINER="slaxemulator@gmail.com" 9.12 @@ -17,6 +17,6 @@ 9.13 { 9.14 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 9.15 cp -a $install/lib/firmware/iwlwifi-3945*.ucode $fs/lib/firmware 9.16 - cp -a $install/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 9.17 + cp -a $install/usr/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 9.18 } 9.19
10.1 --- a/firmware-iwlwifi-4965/receipt Mon Oct 30 13:48:15 2017 +0100 10.2 +++ b/firmware-iwlwifi-4965/receipt Wed Nov 01 05:04:12 2017 -0400 10.3 @@ -1,7 +1,7 @@ 10.4 # SliTaz package receipt. 10.5 10.6 PACKAGE="firmware-iwlwifi-4965" 10.7 -VERSION="20141201" 10.8 +VERSION="20171030" 10.9 CATEGORY="non-free" 10.10 SHORT_DESC="Firmware files for iwlwifi 4965 (legacy)" 10.11 MAINTAINER="slaxemulator@gmail.com" 10.12 @@ -17,5 +17,5 @@ 10.13 { 10.14 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 10.15 cp -a $install/lib/firmware/iwlwifi-4965*.ucode $fs/lib/firmware 10.16 - cp -a $install/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 10.17 + cp -a $install/usr/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 10.18 }
11.1 --- a/firmware-iwlwifi-5000/receipt Mon Oct 30 13:48:15 2017 +0100 11.2 +++ b/firmware-iwlwifi-5000/receipt Wed Nov 01 05:04:12 2017 -0400 11.3 @@ -1,7 +1,7 @@ 11.4 # SliTaz package receipt. 11.5 11.6 PACKAGE="firmware-iwlwifi-5000" 11.7 -VERSION="20141201" 11.8 +VERSION="20171030" 11.9 CATEGORY="non-free" 11.10 SHORT_DESC="Firmware files for iwlwifi 5000" 11.11 MAINTAINER="slaxemulator@gmail.com" 11.12 @@ -17,6 +17,6 @@ 11.13 { 11.14 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 11.15 cp -a $install/lib/firmware/iwlwifi-5000*.ucode $fs/lib/firmware 11.16 - cp -a $install/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 11.17 + cp -a $install/usr/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 11.18 } 11.19
12.1 --- a/firmware-iwlwifi-5150/receipt Mon Oct 30 13:48:15 2017 +0100 12.2 +++ b/firmware-iwlwifi-5150/receipt Wed Nov 01 05:04:12 2017 -0400 12.3 @@ -1,7 +1,7 @@ 12.4 # SliTaz package receipt. 12.5 12.6 PACKAGE="firmware-iwlwifi-5150" 12.7 -VERSION="20141201" 12.8 +VERSION="20171030" 12.9 CATEGORY="non-free" 12.10 SHORT_DESC="Firmware files for iwlwifi 5150" 12.11 MAINTAINER="slaxemulator@gmail.com" 12.12 @@ -17,6 +17,6 @@ 12.13 { 12.14 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 12.15 cp -a $install/lib/firmware/iwlwifi-5150*.ucode $fs/lib/firmware 12.16 - cp -a $install/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 12.17 + cp -a $install/usr/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 12.18 } 12.19
13.1 --- a/firmware-iwlwifi-6000/receipt Mon Oct 30 13:48:15 2017 +0100 13.2 +++ b/firmware-iwlwifi-6000/receipt Wed Nov 01 05:04:12 2017 -0400 13.3 @@ -1,7 +1,7 @@ 13.4 # SliTaz package receipt. 13.5 13.6 PACKAGE="firmware-iwlwifi-6000" 13.7 -VERSION="20141201" 13.8 +VERSION="20171030" 13.9 CATEGORY="non-free" 13.10 SHORT_DESC="Firmware files for iwlwifi 6000" 13.11 MAINTAINER="slaxemulator@gmail.com" 13.12 @@ -17,6 +17,6 @@ 13.13 { 13.14 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 13.15 cp -a $install/lib/firmware/iwlwifi-6000*.ucode $fs/lib/firmware 13.16 - cp -a $install/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 13.17 + cp -a $install/usr/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 13.18 } 13.19
14.1 --- a/firmware-iwlwifi-6050/receipt Mon Oct 30 13:48:15 2017 +0100 14.2 +++ b/firmware-iwlwifi-6050/receipt Wed Nov 01 05:04:12 2017 -0400 14.3 @@ -1,7 +1,7 @@ 14.4 # SliTaz package receipt. 14.5 14.6 PACKAGE="firmware-iwlwifi-6050" 14.7 -VERSION="20141201" 14.8 +VERSION="20171030" 14.9 CATEGORY="non-free" 14.10 SHORT_DESC="Firmware files for iwlwifi 6050" 14.11 MAINTAINER="slaxemulator@gmail.com" 14.12 @@ -17,6 +17,6 @@ 14.13 { 14.14 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 14.15 cp -a $install/lib/firmware/iwlwifi-6050*.ucode $fs/lib/firmware 14.16 - cp -a $install/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 14.17 + cp -a $install/usr/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 14.18 } 14.19
15.1 --- a/firmware-iwlwifi-7260/receipt Mon Oct 30 13:48:15 2017 +0100 15.2 +++ b/firmware-iwlwifi-7260/receipt Wed Nov 01 05:04:12 2017 -0400 15.3 @@ -1,7 +1,7 @@ 15.4 # SliTaz package receipt. 15.5 15.6 PACKAGE="firmware-iwlwifi-7260" 15.7 -VERSION="20141201" 15.8 +VERSION="20171030" 15.9 CATEGORY="non-free" 15.10 SHORT_DESC="Firmware files for iwlwifi 7260" 15.11 MAINTAINER="al.bobylev@gmail.com" 15.12 @@ -17,5 +17,5 @@ 15.13 { 15.14 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 15.15 cp -a $install/lib/firmware/iwlwifi-7260*.ucode $fs/lib/firmware 15.16 - cp -a $install/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 15.17 + cp -a $install/usr/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 15.18 }
16.1 --- a/firmware-iwlwifi-7265/receipt Mon Oct 30 13:48:15 2017 +0100 16.2 +++ b/firmware-iwlwifi-7265/receipt Wed Nov 01 05:04:12 2017 -0400 16.3 @@ -1,7 +1,7 @@ 16.4 # SliTaz package receipt. 16.5 16.6 PACKAGE="firmware-iwlwifi-7265" 16.7 -VERSION="20141201" 16.8 +VERSION="20171030" 16.9 CATEGORY="non-free" 16.10 SHORT_DESC="Firmware files for iwlwifi 7265" 16.11 MAINTAINER="al.bobylev@gmail.com" 16.12 @@ -17,5 +17,5 @@ 16.13 { 16.14 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 16.15 cp -a $install/lib/firmware/iwlwifi-7265*.ucode $fs/lib/firmware 16.16 - cp -a $install/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 16.17 + cp -a $install/usr/share/licenses/LICENCE.iwlwifi_firmware $fs/usr/share/licenses 16.18 }
17.1 --- a/firmware-radeon/receipt Mon Oct 30 13:48:15 2017 +0100 17.2 +++ b/firmware-radeon/receipt Wed Nov 01 05:04:12 2017 -0400 17.3 @@ -1,7 +1,7 @@ 17.4 # SliTaz package receipt. 17.5 17.6 PACKAGE="firmware-radeon" 17.7 -VERSION="20141201" 17.8 +VERSION="20171030" 17.9 CATEGORY="non-free" 17.10 SHORT_DESC="Firmware files for radeon" 17.11 MAINTAINER="slaxemulator@gmail.com" 17.12 @@ -17,6 +17,6 @@ 17.13 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 17.14 cp -a $install/lib/firmware/radeon $fs/lib/firmware 17.15 cp -a $install/lib/firmware/r128 $fs/lib/firmware 17.16 - cp -a $install/share/licenses/LICENSE.radeon $fs/usr/share/licenses 17.17 + cp -a $src/LICENSE.radeon $fs/usr/share/licenses 17.18 } 17.19
18.1 --- a/firmware-rt2x00/receipt Mon Oct 30 13:48:15 2017 +0100 18.2 +++ b/firmware-rt2x00/receipt Wed Nov 01 05:04:12 2017 -0400 18.3 @@ -1,7 +1,7 @@ 18.4 # SliTaz package receipt. 18.5 18.6 PACKAGE="firmware-rt2x00" 18.7 -VERSION="20141201" 18.8 +VERSION="20171030" 18.9 CATEGORY="non-free" 18.10 SHORT_DESC="Firmware files for all rt2x00 modules." 18.11 MAINTAINER="slaxemulator@gmail.com" 18.12 @@ -18,5 +18,5 @@ 18.13 { 18.14 mkdir -p $fs/lib/firmware $fs/usr/share/licenses 18.15 cp -a $install/lib/firmware/rt*.bin $fs/lib/firmware 18.16 - cp -a $install/share/licenses/LICENCE.ralink* $fs/usr/share/licenses 18.17 + cp -a $install/usr/share/licenses/LICENCE.ralink* $fs/usr/share/licenses 18.18 }
19.1 --- a/firmware-rtlnic/receipt Mon Oct 30 13:48:15 2017 +0100 19.2 +++ b/firmware-rtlnic/receipt Wed Nov 01 05:04:12 2017 -0400 19.3 @@ -1,7 +1,7 @@ 19.4 # SliTaz package receipt. 19.5 19.6 PACKAGE="firmware-rtlnic" 19.7 -VERSION="20141201" 19.8 +VERSION="20171030" 19.9 CATEGORY="non-free" 19.10 SHORT_DESC="Firmware files for Realtek ethernet" 19.11 MAINTAINER="mojo@slitaz.org" 19.12 @@ -14,5 +14,5 @@ 19.13 { 19.14 mkdir -p $fs/lib/firmware/ $fs/usr/share/licenses 19.15 cp -a $install/lib/firmware/rtl_nic $fs/lib/firmware 19.16 - cp -a $install/share/licenses/LICENCE.rtlwifi_firmware.txt $fs/usr/share/licenses 19.17 + cp -a $install/usr/share/licenses/LICENCE.rtlwifi_firmware.txt $fs/usr/share/licenses 19.18 }
20.1 --- a/firmware-rtlwifi/receipt Mon Oct 30 13:48:15 2017 +0100 20.2 +++ b/firmware-rtlwifi/receipt Wed Nov 01 05:04:12 2017 -0400 20.3 @@ -1,7 +1,7 @@ 20.4 # SliTaz package receipt. 20.5 20.6 PACKAGE="firmware-rtlwifi" 20.7 -VERSION="20141201" 20.8 +VERSION="20171030" 20.9 CATEGORY="non-free" 20.10 SHORT_DESC="Firmware files for rtlwifi modules." 20.11 MAINTAINER="mojo@slitaz.org" 20.12 @@ -16,6 +16,6 @@ 20.13 { 20.14 mkdir -p $fs/lib/firmware/rtlwifi $fs/usr/share/licenses 20.15 cp -a $install/lib/firmware/rtlwifi/* $fs/lib/firmware/rtlwifi 20.16 - cp -a $install/share/licenses/LICENCE.rtlwifi_firmware.txt $fs/usr/share/licenses 20.17 + cp -a $install/usr/share/licenses/LICENCE.rtlwifi_firmware.txt $fs/usr/share/licenses 20.18 } 20.19
21.1 --- a/firmware/receipt Mon Oct 30 13:48:15 2017 +0100 21.2 +++ b/firmware/receipt Wed Nov 01 05:04:12 2017 -0400 21.3 @@ -1,29 +1,26 @@ 21.4 # SliTaz package receipt. 21.5 21.6 PACKAGE="firmware" 21.7 -SOURCE="linux-firmware" 21.8 -VERSION="20141201" 21.9 -REVISION="38e5405" 21.10 +VERSION="20171030" 21.11 CATEGORY="meta" 21.12 SHORT_DESC="Firmware files for Linux" 21.13 -MAINTAINER="slaxemulator@gmail.com" 21.14 +MAINTAINER="mojo@slitaz.org" 21.15 LICENSE="other" 21.16 -TARBALL="$SOURCE-$VERSION.$REVISION-1-any.pkg.tar.xz" 21.17 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 21.18 WEB_SITE="http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git" 21.19 -WGET_URL="http://archlinux.mirrors.ovh.net/archlinux/core/os/i686/$TARBALL" 21.20 +WGET_URL="git|git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" 21.21 +BUILD_DEPENDS="git" 21.22 21.23 # Rules to configure and make the package. 21.24 compile_rules() 21.25 { 21.26 - mkdir -p $DESTDIR/lib $DESTDIR/share 21.27 - mv $src/share/licenses/linux-firmware/* $src/share/licenses 21.28 - rm -fr $src/share/licenses/linux-firmware $src/lib/tmpfiles.d 21.29 - cp -a $src/* $DESTDIR 21.30 + make install 21.31 } 21.32 21.33 # Rules to gen a SliTaz package suitable for Tazpkg. 21.34 genpkg_rules() 21.35 { 21.36 - mkdir -p $fs/lib/firmware 21.37 + mkdir -p $install/usr/share/licenses 21.38 + cp -a $src/LICENCE.* $install/usr/share/licenses 21.39 } 21.40