package/mesa3d: add lm-sensors optional dependency

PATCH New Romain Naour 4 participants 8 messages Mar 19, 2017 – Mar 30, 2017

lore

Share & tools

lore

Romain Naour

author

2017-03-19 20:51 UTC #0 lore raw

PATCH 1/3 package/mesa3d: add lm-sensors optional dependency

radeon-pci-0008
Adapter: PCI adapter
temp1: +56.0 C (crit = +120.0 C, hyst = +90.0 C)

Signed-off-by Romain Naour <[email protected]>

Cc Bernd Kuhls <[email protected]>

---
 package/mesa3d/mesa3d.mk | 7 +++++++
 1 file changed, 7 insertions(+)

package/mesa3d/mesa3d.mk +7 -0

index d29a043..61baa50 100644
@@ -180,6 +180,13 @@ else
 MESA3D_CONF_OPTS += --disable-gles1 --disable-gles2
 endif
 
+ifeq ($(BR2_PACKAGE_LM_SENSORS),y)
+MESA3D_CONF_OPTS += --enable-lmsensors
+MESA3D_DEPENDENCIES += lm-sensors
+else
+MESA3D_CONF_OPTS += --disable-lmsensors
+endif
+
 # Avoid automatic search of llvm-config
 MESA3D_CONF_OPTS += --with-llvm-prefix=$(STAGING_DIR)/usr/bin

Signature · 1 line

2.9.3

Romain Naour

author

2017-03-19 20:51 UTC #1 lore raw

PATCH 2/3 package/x11r7/xserver_xorg-server: bump to version 1.19.3

Signed-off-by Romain Naour <[email protected]>

Cc Bernd Kuhls <[email protected]>

---
 .../{1.19.2 => 1.19.3}/0001-modesettings-needs-dri2.patch             | 0
 .../0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch             | 0
 .../{1.19.2 => 1.19.3}/0003-Remove-check-for-useSIGIO-option.patch    | 0
 package/x11r7/xserver_xorg-server/Config.in                           | 4 ++--
 package/x11r7/xserver_xorg-server/xserver_xorg-server.hash            | 4 ++--
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename package/x11r7/xserver_xorg-server/{1.19.2 => 1.19.3}/0001-modesettings-needs-dri2.patch (100%)
 rename package/x11r7/xserver_xorg-server/{1.19.2 => 1.19.3}/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch (100%)
 rename package/x11r7/xserver_xorg-server/{1.19.2 => 1.19.3}/0003-Remove-check-for-useSIGIO-option.patch (100%)

package/x11r7/xserver_xorg-server/1.19.3/0001-modesettings-needs-dri2.patch renamed from package/x11r7/xserver_xorg-server/1.19.2/0001-modesettings-needs-dri2.patch +0 -0

similarity index 100%
rename from package/x11r7/xserver_xorg-server/1.19.2/0001-modesettings-needs-dri2.patch
rename to package/x11r7/xserver_xorg-server/1.19.3/0001-modesettings-needs-dri2.patch

package/x11r7/xserver_xorg-server/1.19.3/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch renamed from package/x11r7/xserver_xorg-server/1.19.2/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch +0 -0

similarity index 100%
rename from package/x11r7/xserver_xorg-server/1.19.2/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
rename to package/x11r7/xserver_xorg-server/1.19.3/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch

package/x11r7/xserver_xorg-server/1.19.3/0003-Remove-check-for-useSIGIO-option.patch renamed from package/x11r7/xserver_xorg-server/1.19.2/0003-Remove-check-for-useSIGIO-option.patch +0 -0

similarity index 100%
rename from package/x11r7/xserver_xorg-server/1.19.2/0003-Remove-check-for-useSIGIO-option.patch
rename to package/x11r7/xserver_xorg-server/1.19.3/0003-Remove-check-for-useSIGIO-option.patch

package/x11r7/xserver_xorg-server/Config.in +2 -2

index 032811e..b04ccf4 100644
@@ -79,7 +79,7 @@ choice
 	bool "X Window System server version"
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
-	bool "1.19.2"
+	bool "1.19.3"
 	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
 	select BR2_PACKAGE_XLIB_LIBXFONT2
 	select BR2_PACKAGE_XPROTO_PRESENTPROTO

@@ -99,7 +99,7 @@ endchoice
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
 	string
-	default "1.19.2" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
+	default "1.19.3" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
 	default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
 	default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14

package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +2 -2

index 456fb8b..b7b4635 100644
@@ -3,5 +3,5 @@ sha1   7a95765e56b124758fcd7b609589e65b8870880b                                x
 sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f        xorg-server-1.14.7.tar.bz2
 # From https://lists.x.org/archives/xorg-announce/2015-October/002650.html
 sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457        xorg-server-1.17.4.tar.bz2
-# From https://lists.x.org/archives/xorg-announce/2017-March/002779.html
-sha256 4f8ab9f4a1a885fe7550080555381b34b82858582559e8e3c4da96e3a85884bb        xorg-server-1.19.2.tar.bz2
+# From https://lists.freedesktop.org/archives/xorg/2017-March/058662.html
+sha256 8f93b98f1ac9fbd87515bfe329a069b48bbec98e5329584ab5fbf759a0953b8d        xorg-server-1.19.3.tar.bz2

Signature · 1 line

2.9.3

Bernd Kuhls

2017-03-20 18:40 UTC #2 lore raw

PATCH 2/3 package/x11r7/xserver_xorg-server: bump to version 1.19.3

Am Sun, 19 Mar 2017 21:51:54 +0100 schrieb Romain Naour:

package/x11r7/xserver_xorg-server/xserver_xorg-server.hash sha1 7a95765e56b124758fcd7b609589e65b8870880b x · line 7

Quoted 4 lines

package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +2 -2

-# From https://lists.x.org/archives/xorg-announce/2017-March/002779.html
-sha256 4f8ab9f4a1a885fe7550080555381b34b82858582559e8e3c4da96e3a85884bb        xorg-server-1.19.2.tar.bz2
+# From https://lists.freedesktop.org/archives/xorg/2017-March/058662.html
+sha256 8f93b98f1ac9fbd87515bfe329a069b48bbec98e5329584ab5fbf759a0953b8d        xorg-server-1.19.3.tar.bz2

Hi,

the new hash is wrong:

ERROR: xorg-server-1.19.3.tar.bz2 has wrong sha256 hash:
ERROR: expected: 8f93b98f1ac9fbd87515bfe329a069b48bbec98e5329584ab5fbf759a0953b8d
ERROR: got : 677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98
ERROR: Incomplete download, or man-in-the-middle (MITM) attack

You used the hash for the gz file.

Regards, Bernd

Thomas Petazzoni

2017-03-20 21:21 UTC #3 lore raw

PATCH 2/3 package/x11r7/xserver_xorg-server: bump to version 1.19.3

Hello,

Quoted 4 lines · Bernd Kuhls

ERROR: xorg-server-1.19.3.tar.bz2 has wrong sha256 hash:
ERROR: expected: 8f93b98f1ac9fbd87515bfe329a069b48bbec98e5329584ab5fbf759a0953b8d
ERROR: got : 677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98
ERROR: Incomplete download, or man-in-the-middle (MITM) attack

Romain fixed it in the third patch, touching the ATI driver, but indeed, it's a bit messed up. I fixed this when applying. Thanks for noticing!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Romain Naour

author

2017-03-20 21:46 UTC #4 lore raw

PATCH 2/3 package/x11r7/xserver_xorg-server: bump to version 1.19.3

Hi Bernd, Thomas,

Le 20/03/2017 ? 22:21, Thomas Petazzoni a ?crit :

Quoted 4 lines

Hello,
On Mon, 20 Mar 2017 19:40:51 +0100, Bernd Kuhls wrote:

Quoted 8 lines

Quoted 4 lines
ERROR: xorg-server-1.19.3.tar.bz2 has wrong sha256 hash:
ERROR: expected: 8f93b98f1ac9fbd87515bfe329a069b48bbec98e5329584ab5fbf759a0953b8d
ERROR: got : 677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98
ERROR: Incomplete download, or man-in-the-middle (MITM) attack
Romain fixed it in the third patch, touching the ATI driver, but indeed, it's a bit messed up. I fixed this when applying. Thanks for noticing!

Thanks for fixing this, Indeed I used the wrong hash initially and I tried to squash the fix in patch 2/3 while rebasing...

Sorry for the mess...

Best regards,
Romain

Quoted 3 lines

Thomas

Romain Naour

author

2017-03-19 20:51 UTC #5 lore raw

PATCH 3/3 package/x11r7/xdriver_xf86-video-ati: bump version to 7.9.0

In reply to Romain Naour

Signed-off-by Romain Naour <[email protected]>

Cc Bernd Kuhls <[email protected]>

---
 package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash | 4 ++--
 package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk   | 2 +-
 package/x11r7/xserver_xorg-server/xserver_xorg-server.hash       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash +2 -2

index fe5ae0e..2cb4037 100644
@@ -1,2 +1,2 @@
-# From https://lists.x.org/archives/xorg-announce/2016-November/002738.html
-sha256 401f5de772928f3dc4ce43a885adb0a47a2f61aa4a9e45d2ab3d184136a9d6fa  xf86-video-ati-7.8.0.tar.bz2
+# From https://lists.freedesktop.org/archives/xorg/2017-March/058669.html
+sha256 3cad872e6330afb1707da11e4e959e6887ebe5bcd81854b4d2e496c52c059875  xf86-video-ati-7.9.0.tar.bz2

package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +1 -1

index ea70167..bc92358 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_ATI_VERSION = 7.8.0
+XDRIVER_XF86_VIDEO_ATI_VERSION = 7.9.0
 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT

package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +1 -1

index b7b4635..841be04 100644
@@ -4,4 +4,4 @@ sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f        x
 # From https://lists.x.org/archives/xorg-announce/2015-October/002650.html
 sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457        xorg-server-1.17.4.tar.bz2
 # From https://lists.freedesktop.org/archives/xorg/2017-March/058662.html
-sha256 8f93b98f1ac9fbd87515bfe329a069b48bbec98e5329584ab5fbf759a0953b8d        xorg-server-1.19.3.tar.bz2
+sha256 677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98        xorg-server-1.19.3.tar.bz2

Signature · 1 line

2.9.3

Thomas Petazzoni

2017-03-20 21:21 UTC #6 lore raw

PATCH 1/3 package/mesa3d: add lm-sensors optional dependency

In reply to Romain Naour

Hello,

Quoted 9 lines · Romain Naour

radeon-pci-0008
Adapter: PCI adapter
temp1: +56.0 C (crit = +120.0 C, hyst = +90.0 C)
Signed-off-by Romain Naour <[email protected]>
Cc Bernd Kuhls <[email protected]>
---
 package/mesa3d/mesa3d.mk | 7 +++++++
 1 file changed, 7 insertions(+)

All three applied, after fixing the bogus hash issue noticed by Bernd.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Peter Korsgaard

2017-03-30 22:19 UTC #7 lore raw

PATCH 1/3 package/mesa3d: add lm-sensors optional dependency

In reply to Romain Naour

Quoted 8 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
radeon-pci-0008
Adapter: PCI adapter
temp1: +56.0 C (crit = +120.0 C, hyst = +90.0 C)
Signed-off-by Romain Naour <[email protected]>
Cc Bernd Kuhls <[email protected]>

Committed to 2017.02.x, thanks.

Signature · 1 line

Bye, Peter Korsgaard