From f3d9f6a40879b59789c742209fcb7e4b3dcd6933 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 14 Mar 2016 19:07:24 +0100 Subject: [PATCH 01/17] arm-mem: update to arm-mem-3aee5f4 Signed-off-by: Stephan Raue --- packages/devel/arm-mem/package.mk | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/packages/devel/arm-mem/package.mk b/packages/devel/arm-mem/package.mk index 4f84f26fcb..7dc796fe2a 100644 --- a/packages/devel/arm-mem/package.mk +++ b/packages/devel/arm-mem/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="arm-mem" -PKG_VERSION="4418bb4" +PKG_VERSION="3aee5f4" PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="GPL" @@ -33,16 +33,11 @@ PKG_LONGDESC="arm-mem is a ARM-accelerated versions of selected functions from s PKG_IS_ADDON="no" PKG_AUTORECONF="no" -if [ "$TARGET_CPU" = "arm1176jzf-s" ]; then - ARMMEM_SO=libarmmem.so -elif [ "$TARGET_CPU" = "cortex-a7" ]; then - ARMMEM_SO=libarmmem-a7.so -fi - -PKG_MAKE_OPTS_TARGET="$ARMMEM_SO" +PKG_MAKE_OPTS_TARGET="libarmmem.so" pre_make_target() { export CROSS_COMPILE=$TARGET_PREFIX + export CFLAGS="$CFLAGS -fPIC" } make_init() { @@ -51,17 +46,17 @@ make_init() { makeinstall_target() { mkdir -p $INSTALL/lib - cp -P $ARMMEM_SO $INSTALL/lib + cp -P libarmmem.so $INSTALL/lib mkdir -p $INSTALL/etc - echo "/lib/$ARMMEM_SO" >> $INSTALL/etc/ld.so.preload + echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload } makeinstall_init() { mkdir -p $INSTALL/lib - cp -P $ARMMEM_SO $INSTALL/lib + cp -P libarmmem.so $INSTALL/lib mkdir -p $INSTALL/etc - echo "/lib/$ARMMEM_SO" >> $INSTALL/etc/ld.so.preload + echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload } From 5f8cc854fb71fa75a980d128ad685fd9dfae6f70 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 14 Mar 2016 19:32:13 +0100 Subject: [PATCH 02/17] dcadec: update to dcadec-0e07438 Signed-off-by: Stephan Raue --- packages/audio/dcadec/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/audio/dcadec/package.mk b/packages/audio/dcadec/package.mk index 40318963a2..59a5a6d2a2 100644 --- a/packages/audio/dcadec/package.mk +++ b/packages/audio/dcadec/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="dcadec" -PKG_VERSION="37d8e68" +PKG_VERSION="0e07438" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 093bd58ee04564b915b0b7a0f57f897945a2ff26 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 14 Mar 2016 19:49:49 +0100 Subject: [PATCH 03/17] json-c: update to json-c-537f8bc Signed-off-by: Stephan Raue --- packages/devel/json-c/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devel/json-c/package.mk b/packages/devel/json-c/package.mk index e61da59d65..0285bb0f19 100644 --- a/packages/devel/json-c/package.mk +++ b/packages/devel/json-c/package.mk @@ -18,7 +18,7 @@ ################################################################################ PKG_NAME="json-c" -PKG_VERSION="0645020" +PKG_VERSION="537f8bc" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 410d0acb049147572a900d1822408bc74e5a5d19 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 14 Mar 2016 20:08:04 +0100 Subject: [PATCH 04/17] libshairplay: update to libshairplay-ce80e00 Signed-off-by: Stephan Raue --- packages/network/libshairplay/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/libshairplay/package.mk b/packages/network/libshairplay/package.mk index 204df1a85f..73dbf344d9 100644 --- a/packages/network/libshairplay/package.mk +++ b/packages/network/libshairplay/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="libshairplay" -PKG_VERSION="498bc5b" +PKG_VERSION="ce80e00" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From d8deab9b6b1ce2e232a863803fb45ded27c68bf9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 15 Mar 2016 00:47:40 +0100 Subject: [PATCH 05/17] RTL8192EU: update to RTL8192EU-a322c84 Signed-off-by: Stephan Raue --- packages/linux-drivers/RTL8192EU/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-drivers/RTL8192EU/package.mk b/packages/linux-drivers/RTL8192EU/package.mk index 56745eb2e2..bc3c59fdb2 100644 --- a/packages/linux-drivers/RTL8192EU/package.mk +++ b/packages/linux-drivers/RTL8192EU/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="RTL8192EU" -PKG_VERSION="6793bae" +PKG_VERSION="a322c84" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 715d7a2c2cc6730f158af263d9fbe1c0385e26b7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 15 Mar 2016 15:28:15 +0100 Subject: [PATCH 06/17] RTL8192DU: update to RTL8192DU-9e7eb15 Signed-off-by: Stephan Raue --- packages/linux-drivers/RTL8192DU/package.mk | 2 +- .../RTL8192DU-fix-build-kernel-4.2.patch | 30 ------------------- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 packages/linux-drivers/RTL8192DU/patches/RTL8192DU-fix-build-kernel-4.2.patch diff --git a/packages/linux-drivers/RTL8192DU/package.mk b/packages/linux-drivers/RTL8192DU/package.mk index 06a21276d3..5cbfcb9f12 100644 --- a/packages/linux-drivers/RTL8192DU/package.mk +++ b/packages/linux-drivers/RTL8192DU/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="RTL8192DU" -PKG_VERSION="7498302" +PKG_VERSION="9e7eb15" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux-drivers/RTL8192DU/patches/RTL8192DU-fix-build-kernel-4.2.patch b/packages/linux-drivers/RTL8192DU/patches/RTL8192DU-fix-build-kernel-4.2.patch deleted file mode 100644 index ab9010dfd2..0000000000 --- a/packages/linux-drivers/RTL8192DU/patches/RTL8192DU-fix-build-kernel-4.2.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9e7eb15c74779150e7cc7229a06335a579366f2a Mon Sep 17 00:00:00 2001 -From: Larry Finger -Date: Mon, 28 Sep 2015 19:55:49 -0500 -Subject: [PATCH] rtl8192du: Fix build on kernel 4.2 - -Signed-off-by: Larry Finger ---- - os_dep/ioctl_cfg80211.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/os_dep/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c -index a2bc7ed..7054e3a 100644 ---- a/os_dep/ioctl_cfg80211.c -+++ b/os_dep/ioctl_cfg80211.c -@@ -491,8 +491,13 @@ void rtw_cfg80211_indicate_disconnect(struct rtw_adapter *padapter) - WLAN_STATUS_UNSPECIFIED_FAILURE, - GFP_ATOMIC/*GFP_KERNEL*/); - } else { -- cfg80211_disconnected(padapter->pnetdev, 0, NULL, -- 0, GFP_ATOMIC); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) -+ cfg80211_disconnected(padapter->pnetdev, 0, -+ NULL, 0, true, GFP_ATOMIC); -+#else -+ cfg80211_disconnected(padapter->pnetdev, 0, NULL, 0, -+ GFP_ATOMIC); -+#endif - } - } - } From 01ab738b6e5c37cbc85d642e708ad33a10ea5440 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 15 Mar 2016 17:02:28 +0100 Subject: [PATCH 07/17] tools/mkpkg: rework binary-addons mkpkg script to only update package.mk and dot get and repack sources Signed-off-by: Stephan Raue --- ...pkg_binary-addons => update_binary-addons} | 66 ++++++------------- 1 file changed, 20 insertions(+), 46 deletions(-) rename tools/mkpkg/{mkpkg_binary-addons => update_binary-addons} (70%) diff --git a/tools/mkpkg/mkpkg_binary-addons b/tools/mkpkg/update_binary-addons similarity index 70% rename from tools/mkpkg/mkpkg_binary-addons rename to tools/mkpkg/update_binary-addons index fabb8c2d32..526275d4dc 100755 --- a/tools/mkpkg/mkpkg_binary-addons +++ b/tools/mkpkg/update_binary-addons @@ -47,30 +47,6 @@ git_clone() { fi } -copy_sources() { - # copy_sources source_dir package_name package_version - if [ -d "$1" ] ; then - echo "[mkpkg] Copying sources: $2-$3" ... - rm -rf "$2-$3" - cp -R "$1" "$2-$3" - echo "$GIT_HASH" > "$2-$3/VERSION" - - echo "[mkpkg] Cleaning $2-$3 ..." - rm -rf "$2-$3/.git" - fi -} - -package_sources() { - # package_sources source_dir - if [ -d "$1" ] ; then - echo "[mkpkg] Packing $1.tar.xz ..." - if [ ! -f "$1.tar.xz" ] ; then - tar cvJf "$1.tar.xz" "$1" - fi - rm -rf "$1" - fi -} - resolve_hash() { if [ -d "$1" ] ; then cd "$1" @@ -78,20 +54,6 @@ resolve_hash() { fi } -copy_and_package() { - REPO="$1" - PKG_NAME="$2" - GIT_HASH="$3" - git_clone $REPO master $PKG_NAME.git $GIT_HASH - RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH) - if [ ! -e $PKG_NAME-$RESOLVED_HASH.tar.xz ] ; then - copy_sources $PKG_NAME.git $PKG_NAME $RESOLVED_HASH - package_sources $PKG_NAME-$RESOLVED_HASH - else - echo "[mkpkg] $PKG_NAME-$RESOLVED_HASH.tar.xz already exists ..." - fi -} - if [ ! -d $KODI_DIR ] ; then echo "meh.. $KODI_DIR does not exist" exit 127 @@ -100,26 +62,32 @@ fi # platform REPO=$(cat $KODI_DIR/project/cmake/addons/depends/common/platform/platform.txt | awk '{print $2}') GIT_HASH=$(cat $KODI_DIR/project/cmake/addons/depends/common/platform/platform.txt | awk '{print $3}') +PKG_NAME="platform" -copy_and_package $REPO platform $GIT_HASH - +git_clone $REPO master $PKG_NAME.git $GIT_HASH if [ -f ../../packages/mediacenter/platform/package.mk ] ; then # update package.mk RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH) - sed -i "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" ../../packages/mediacenter/platform/package.mk + sed -e "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" \ + -e "s|PKG_GIT_URL=.*|PKG_GIT_URL=\"$REPO\"|g" \ + -i ../../packages/mediacenter/platform/package.mk fi +rm -rf $PKG_NAME.git # kodi-platform REPO=$(cat $KODI_DIR/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt | awk '{print $2}') GIT_HASH=$(cat $KODI_DIR/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt | awk '{print $3}') +PKG_NAME="kodi-platform" -copy_and_package $REPO kodi-platform $GIT_HASH - +git_clone $REPO master $PKG_NAME.git $GIT_HASH if [ -f ../../packages/mediacenter/kodi-platform/package.mk ] ; then # update package.mk RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH) - sed -i "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" ../../packages/mediacenter/kodi-platform/package.mk + sed -e "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" \ + -e "s|PKG_GIT_URL=.*|PKG_GIT_URL=\"$REPO\"|g" \ + -i ../../packages/mediacenter/kodi-platform/package.mk fi +rm -rf $PKG_NAME.git # addons for addontxt in $KODI_DIR/project/cmake/addons/bootstrap/repositories/*-addons.txt ; do @@ -131,17 +99,23 @@ for addontxt in $KODI_DIR/project/cmake/addons/bootstrap/repositories/*-addons.t ADDON=$(basename $addon) REPO=$(cat $addon/$ADDON.txt | awk '{print $2}') GIT_HASH=$(cat $addon/$ADDON.txt | awk '{print $3}') + PKG_NAME="$ADDON" if ! grep -q all $addon/platforms.txt && ! grep -q linux $addon/platforms.txt && ! grep -q ! $addon/platforms.txt; then continue fi if [ -f ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ] ; then - copy_and_package $REPO $ADDON $GIT_HASH + git_clone $REPO master $PKG_NAME.git $GIT_HASH # update package.mk RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH) - sed -i "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk + sed -e "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" \ + -e "s|PKG_GIT_URL=.*|PKG_GIT_URL=\"$REPO\"|g" \ + -i ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk + + rm -rf $PKG_NAME.git + else echo "[mkpkg] Skipped $ADDON" fi From dd95168bb8b71c30f3a176d27361cdada081e82b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 15 Mar 2016 21:06:52 +0100 Subject: [PATCH 08/17] libva: update to libva-1.7.0 Signed-off-by: Stephan Raue --- packages/multimedia/libva/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/multimedia/libva/package.mk b/packages/multimedia/libva/package.mk index 3fa4049773..14653d11cd 100644 --- a/packages/multimedia/libva/package.mk +++ b/packages/multimedia/libva/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="libva" -PKG_VERSION="1.6.2" +PKG_VERSION="1.7.0" PKG_REV="1" PKG_ARCH="x86_64" PKG_LICENSE="GPL" From 618a884d4db31c31dec9481b96a7a6715247d4bd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 15 Mar 2016 21:07:05 +0100 Subject: [PATCH 09/17] libva-intel-driver: update to libva-intel-driver-1.7.0 Signed-off-by: Stephan Raue --- packages/multimedia/libva-intel-driver/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/multimedia/libva-intel-driver/package.mk b/packages/multimedia/libva-intel-driver/package.mk index 3dcd68ec19..dac7575200 100644 --- a/packages/multimedia/libva-intel-driver/package.mk +++ b/packages/multimedia/libva-intel-driver/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="libva-intel-driver" -PKG_VERSION="1.6.2" +PKG_VERSION="1.7.0" PKG_REV="1" PKG_ARCH="x86_64" PKG_LICENSE="GPL" From b2c146b3697645a1b557946122e425040cda130d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 16 Mar 2016 01:36:00 +0100 Subject: [PATCH 10/17] mesa: update to mesa-11.2.0-rc3 Signed-off-by: Stephan Raue --- packages/graphics/mesa/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk index a68c799a18..72f6853b18 100644 --- a/packages/graphics/mesa/package.mk +++ b/packages/graphics/mesa/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="mesa" -PKG_VERSION="11.2.0-rc2" +PKG_VERSION="11.2.0-rc3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From 3de475b3440e0a385c40635756dd1884de291a27 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 16 Mar 2016 10:53:06 +0100 Subject: [PATCH 11/17] projects/imx6: dont build package 'RTL8812AU' Signed-off-by: Stephan Raue --- projects/imx6/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/imx6/options b/projects/imx6/options index c6716d9617..1161fc5e83 100644 --- a/projects/imx6/options +++ b/projects/imx6/options @@ -122,7 +122,7 @@ # for a list of additinoal drivers see packages/linux-drivers # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" - ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8188EU RTL8812AU dvbhdhomerun" + ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8188EU dvbhdhomerun" # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, From 66eb9d73f7fcfd1f15b1847622000bdd19662321 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 17 Mar 2016 00:42:13 +0100 Subject: [PATCH 12/17] samba: dont depend on package 'attr' Signed-off-by: Stephan Raue --- packages/network/samba/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index 854b613fd5..b99387493b 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.samba.org" PKG_URL="http://samba.org/samba/ftp/stable/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain zlib attr connman" +PKG_DEPENDS_TARGET="toolchain zlib connman" PKG_PRIORITY="optional" PKG_SECTION="network" PKG_SHORTDESC="samba: The free SMB / CIFS fileserver and client" From e3789c632a5faa7df3e693ebf7ce87e73d276384 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 17 Mar 2016 00:44:01 +0100 Subject: [PATCH 13/17] libcap: update to libcap-2.25, dont depend on package 'attr' anymore Signed-off-by: Stephan Raue --- packages/devel/libcap/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/devel/libcap/package.mk b/packages/devel/libcap/package.mk index 54a6ce3bfd..8b049e925f 100644 --- a/packages/devel/libcap/package.mk +++ b/packages/devel/libcap/package.mk @@ -18,14 +18,14 @@ ################################################################################ PKG_NAME="libcap" -PKG_VERSION="2.24" +PKG_VERSION="2.25" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="" PKG_URL="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS_HOST="ccache:host" -PKG_DEPENDS_TARGET="toolchain attr" +PKG_DEPENDS_TARGET="toolchain" PKG_PRIORITY="optional" PKG_SECTION="devel" PKG_SHORTDESC="libcap: A library for getting and setting POSIX.1e capabilities" @@ -50,7 +50,7 @@ make_host() { CFLAGS="$HOST_CFLAGS" \ BUILD_CC=$HOST_CC \ BUILD_CFLAGS="$HOST_CFLAGS -I$ROOT/$PKG_BUILD/libcap/include" \ - PAM_CAP=no LIBATTR=no \ + PAM_CAP=no \ lib=/lib \ -C libcap libcap.pc libcap.a } From 081dc26668b4d69af353692f7e80bf2affc6c313 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 18 Mar 2016 21:09:06 +0100 Subject: [PATCH 14/17] new package: add package 'cpu-firmware' Signed-off-by: Stephan Raue --- .../linux-firmware/cpu-firmware/package.mk | 51 +++++++++++++++++++ packages/linux/package.mk | 2 +- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 packages/linux-firmware/cpu-firmware/package.mk diff --git a/packages/linux-firmware/cpu-firmware/package.mk b/packages/linux-firmware/cpu-firmware/package.mk new file mode 100644 index 0000000000..953a61c56c --- /dev/null +++ b/packages/linux-firmware/cpu-firmware/package.mk @@ -0,0 +1,51 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# +# OpenELEC is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# OpenELEC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC. If not, see . +################################################################################ + +PKG_NAME="cpu-firmware" +PKG_VERSION="9885c9c" +PKG_REV="1" +PKG_ARCH="i386 x86_64" +PKG_LICENSE="other" +PKG_SITE="https://git.fedorahosted.org/cgit/microcode_ctl.git/" +PKG_GIT_URL="https://github.com/OpenELEC/cpu-firmware.git" +PKG_GIT_BRANCH="master" +PKG_DEPENDS_INIT="toolchain" +PKG_DEPENDS_TARGET="toolchain" +PKG_PRIORITY="optional" +PKG_SECTION="linux-firmware" +PKG_SHORTDESC="cpu-microcode: Intel and AMD CPU microcodes" +PKG_LONGDESC="cpu-microcode: Intel and AMD CPU microcodes" + +PKG_IS_ADDON="no" +PKG_AUTORECONF="no" + +make_init() { + : # nothing todo +} + +makeinstall_init() { + DESTDIR=$INSTALL ./install +} + +make_target() { + : # nothing todo +} + +makeinstall_target() { + DESTDIR=$INSTALL ./install +} diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 7f0f4c6f39..dfebdc6412 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,7 +23,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.kernel.org" PKG_DEPENDS_HOST="ccache:host" PKG_DEPENDS_TARGET="toolchain cpio:host kmod:host pciutils xz:host wireless-regdb keyutils" -PKG_DEPENDS_INIT="toolchain" +PKG_DEPENDS_INIT="toolchain cpu-firmware:init" PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_PRIORITY="optional" PKG_SECTION="linux" From 6c2e5ce1c2febd8c58b733d5b9abdc1ad8232257 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 18 Mar 2016 21:44:14 +0100 Subject: [PATCH 15/17] busybox: load cpu firmwares in initramfs Signed-off-by: Stephan Raue --- packages/sysutils/busybox/scripts/init | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 0f8bfc5651..7283acdee5 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -57,6 +57,11 @@ LIVE="no" + # load cpu firmware if possible + if [ -e /sys/devices/system/cpu/microcode/reload ]; then + echo 1 > /sys/devices/system/cpu/microcode/reload + fi + # hide kernel log messages on console echo '1 4 1 7' > /proc/sys/kernel/printk From 959b9928cd97b8716e13d621f9d892f0f341405c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 19 Mar 2016 00:44:44 +0100 Subject: [PATCH 16/17] busybox: update to busybox-1.24.2 Signed-off-by: Stephan Raue --- packages/sysutils/busybox/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index 9e41f75e95..9c13d9779a 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="busybox" -PKG_VERSION="1.24.1" +PKG_VERSION="1.24.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From d1ee991bc246b46b91f96275671e044396470a38 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 19 Mar 2016 13:35:42 -0700 Subject: [PATCH 17/17] cpu-firmware: update url and add makefile patch --- .../linux-firmware/cpu-firmware/package.mk | 20 +++--- .../cpu-firmware-0001-fix-makefile.patch | 66 +++++++++++++++++++ 2 files changed, 78 insertions(+), 8 deletions(-) create mode 100644 packages/linux-firmware/cpu-firmware/patches/cpu-firmware-0001-fix-makefile.patch diff --git a/packages/linux-firmware/cpu-firmware/package.mk b/packages/linux-firmware/cpu-firmware/package.mk index 953a61c56c..5fde7988bb 100644 --- a/packages/linux-firmware/cpu-firmware/package.mk +++ b/packages/linux-firmware/cpu-firmware/package.mk @@ -17,13 +17,13 @@ ################################################################################ PKG_NAME="cpu-firmware" -PKG_VERSION="9885c9c" +PKG_VERSION="5e23731" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="other" -PKG_SITE="https://git.fedorahosted.org/cgit/microcode_ctl.git/" -PKG_GIT_URL="https://github.com/OpenELEC/cpu-firmware.git" -PKG_GIT_BRANCH="master" +PKG_SITE="https://git.fedorahosted.org/cgit/microcode_ctl.git" +PKG_URL="https://git.fedorahosted.org/cgit/microcode_ctl.git/snapshot/$PKG_VERSION.tar.xz" +PKG_SOURCE_DIR="$PKG_VERSION" PKG_DEPENDS_INIT="toolchain" PKG_DEPENDS_TARGET="toolchain" PKG_PRIORITY="optional" @@ -35,17 +35,21 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" make_init() { - : # nothing todo + PREFIX=/ + MICDIR=/lib/firmware + make } makeinstall_init() { - DESTDIR=$INSTALL ./install + DESTDIR=$INSTALL make install } make_target() { - : # nothing todo + PREFIX=/ + MICDIR=/lib/firmware + make } makeinstall_target() { - DESTDIR=$INSTALL ./install + DESTDIR=$INSTALL make install } diff --git a/packages/linux-firmware/cpu-firmware/patches/cpu-firmware-0001-fix-makefile.patch b/packages/linux-firmware/cpu-firmware/patches/cpu-firmware-0001-fix-makefile.patch new file mode 100644 index 0000000000..0e797e0c64 --- /dev/null +++ b/packages/linux-firmware/cpu-firmware/patches/cpu-firmware-0001-fix-makefile.patch @@ -0,0 +1,66 @@ +diff -Naur a/Makefile b/Makefile +--- a/Makefile 2016-01-12 07:14:57.000000000 -0800 ++++ b/Makefile 2016-03-19 13:59:39.937499052 -0700 +@@ -14,34 +14,25 @@ + MICROCODE_AMD = amd-ucode-2012-09-10.tar + + INS = install +-CC = gcc +-KERNELHEADER = /usr/src/linux/include ++CC ?= gcc ++KERNELHEADER ?= /usr/src/linux/include + CFLAGS = -g -Wall -O2 -I $(KERNELHEADER) + +-DESTDIR = +-PREFIX = /usr/local ++DESTDIR ?= ++PREFIX ?= /usr/local + + INSDIR = $(PREFIX)/sbin + MANDIR = $(PREFIX)/share/man/man8 + DOCDIR = $(PREFIX)/share/doc/microcode_ctl +-MICDIR = /lib/firmware ++MICDIR ?= /lib/firmware + MICDIRAMD = $(MICDIR)/amd-ucode + +-RCFILE = microcode_ctl.start +-RCFILEFINAL = microcode_ctl +-# this is a bit nasty... +-RCDIR = $(shell if [ -d /etc/init.d ]; then echo "/etc"; else echo "/etc/rc.d"; fi) +-RCHOMEDIR = init.d +-RCFILETO = $(RCDIR)/$(RCHOMEDIR) +- + all: microcode_ctl + +-microcode_ctl: microcode_ctl.c +- $(CC) $(CFLAGS) -o $(PROGRAM) microcode_ctl.c +- mkdir intel-ucode amd-ucode ++microcode_ctl: ++ mkdir -p intel-ucode amd-ucode + tar xfz $(MICROCODE_INTEL) -C intel-ucode + tar --strip-components 1 -xf $(MICROCODE_AMD) -C amd-ucode +- echo "$(RCDIR)/$(RCHOMEDIR)/microcode_ctl" > microcode-filelist + + clean: + rm -rf $(PROGRAM) intel-ucode amd-ucode +@@ -50,20 +41,9 @@ + $(INS) -d $(DESTDIR)$(INSDIR) $(DESTDIR)$(MICDIRAMD) \ + $(DESTDIR)$(MANDIR) $(DESTDIR)$(RCFILETO) \ + $(DESTDIR)$(RCLINKTO) $(DESTDIR)$(DOCDIR) +- $(INS) -m 755 $(PROGRAM) $(DESTDIR)$(INSDIR) +- $(INS) -m 644 $(MANPAGE) $(DESTDIR)$(MANDIR) +- gzip -9f $(DESTDIR)$(MANDIR)/$(MANPAGE) +- $(INS) -m 755 $(RCFILE) $(DESTDIR)$(RCFILETO)/$(RCFILEFINAL) + $(INS) -m 644 intel-ucode/microcode.dat $(DESTDIR)$(MICDIR) + $(INS) -m 644 amd-ucode/microcode_amd.bin $(DESTDIR)$(MICDIR)/amd-ucode/ + $(INS) -m 644 amd-ucode/microcode_amd_fam15h.bin $(DESTDIR)$(MICDIR)/amd-ucode/ +- $(INS) -m 644 amd-ucode/microcode_amd.bin.README \ +- $(DESTDIR)$(DOCDIR)/README.microcode_amd.bin +- $(INS) -m 644 amd-ucode/microcode_amd_fam15h.bin.README \ +- $(DESTDIR)$(DOCDIR)/README.microcode_amd_fam15h.bin +- $(INS) -m 644 amd-ucode/LICENSE $(DESTDIR)$(DOCDIR)/LICENSE.microcode_amd +- $(INS) -m 644 amd-ucode/README $(DESTDIR)$(DOCDIR)/README.microcode_amd +- $(INS) -m 644 amd-ucode/INSTALL $(DESTDIR)$(DOCDIR)/INSTALL.microcode_amd + + ifndef DESTDIR + chkconfig --add $(RCFILEFINAL)