Skip to contentSkip to conversation

acpid: upgrade 2.0.33 -> 2.0.34

PATCH In review Ross Burton 2 participants 10 messages Oct 4, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 acpid: upgrade 2.0.33 -> 2.0.34

---
 meta/recipes-bsp/acpid/{acpid_2.0.33.bb => acpid_2.0.34.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-bsp/acpid/{acpid_2.0.33.bb => acpid_2.0.34.bb} (66%)
meta/recipes-bsp/acpid/acpid_2.0.34.bb renamed from meta/recipes-bsp/acpid/acpid_2.0.33.bb +1 -1
similarity index 66%
rename from meta/recipes-bsp/acpid/acpid_2.0.33.bb
rename to meta/recipes-bsp/acpid/acpid_2.0.34.bb
index 7094ba26622..1e0a6d5f243 100644
@@ -3,4 +3,4 @@ require acpid.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
                     file://acpid.h;endline=24;md5=324a9cf225ae69ddaad1bf9d942115b5"
 
-SRC_URI[sha256sum] = "0856f71b3eb34a1b663d0a8e6363dfcbc519e63d847330498898658e2972dbe8"
+SRC_URI[sha256sum] = "2d095c8cfcbc847caec746d62cdc8d0bff1ec1bc72ef7c674c721e04da6ab333"
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/5 python3-hatchling: upgrade 1.9.0 -> 1.10.0

---
 .../{python3-hatchling_1.9.0.bb => python3-hatchling_1.10.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-hatchling_1.9.0.bb => python3-hatchling_1.10.0.bb} (85%)
meta/recipes-devtools/python/python3-hatchling_1.10.0.bb renamed from meta/recipes-devtools/python/python3-hatchling_1.9.0.bb +1 -1
similarity index 85%
rename from meta/recipes-devtools/python/python3-hatchling_1.9.0.bb
rename to meta/recipes-devtools/python/python3-hatchling_1.10.0.bb
index 011f5ed1101..a0d41d4b0d1 100644
@@ -8,7 +8,7 @@ inherit pypi python_hatchling
 DEPENDS += "python3-pluggy-native python3-tomli-native python3-pathspec-native python3-packaging-native python3-editables-native"
 DEPENDS:remove:class-native = "python3-hatchling-native"
 
-SRC_URI[sha256sum] = "b57c7362f437b9426e4b94228a21d2ac5804fbb2abcb01adde2544a35bb303cd"
+SRC_URI[sha256sum] = "5d31f43dffaf6265c808e1b5353662ffa5146d844278b55caa6c7f74f427ec50"
 
 do_compile:prepend() {
     export PYTHONPATH=src
Signature · 1 line
2.34.1
#2 lore raw

PATCH 3/5 pango: upgrade 1.50.9 -> 1.50.10

In reply to Ross Burton
---
 .../pango/{pango_1.50.9.bb => pango_1.50.10.bb}                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/pango/{pango_1.50.9.bb => pango_1.50.10.bb} (94%)
meta/recipes-graphics/pango/pango_1.50.10.bb renamed from meta/recipes-graphics/pango/pango_1.50.9.bb +1 -1
similarity index 94%
rename from meta/recipes-graphics/pango/pango_1.50.9.bb
rename to meta/recipes-graphics/pango/pango_1.50.10.bb
index 03e2ca67214..95209889a85 100644
@@ -24,7 +24,7 @@ SRC_URI += "file://run-ptest \
             file://0001-Skip-running-test-layout-test.patch \
 "
 
-SRC_URI[archive.sha256sum] = "1b636aabf905130d806372136f5e137b6a27f26d47defd9240bf444f6a4fe610"
+SRC_URI[archive.sha256sum] = "7e5d2f1e40854d24a9a2c4d093bafe75dcdbeccdf1de43e4437332eabed64966"
 
 DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
 
Signature · 1 line
2.34.1
#3 lore raw

PATCH 4/5 piglit: upgrade to latest revision

In reply to Ross Burton

Also disable any attempt at debug splitting/stripping. Piglit installs over 2GB of files which we install stripped, so the action of attempting to split/strip takes a long time and achieves nothing.

---
 meta/recipes-graphics/piglit/piglit_git.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-graphics/piglit/piglit_git.bb +4 -2
index f758208c6bc..c9cf5795e99 100644
@@ -14,7 +14,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-SRCREV = "265896c86f90cb72e8f218ba6a3617fca8b9a1e3"
+SRCREV = "80465078a0ae8f12411db66850ee14f017962fa7"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr${SRCPV}"
 
@@ -52,8 +52,10 @@ do_configure:prepend() {
    fi
 }
 
-# Forcibly strip because Piglit is *huge*
+# Forcibly strip because Piglit is *huge*, and don't bother trying to split/strip the result.
 OECMAKE_TARGET_INSTALL = "install/strip"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
 RDEPENDS:${PN} = "waffle waffle-bin python3 python3-mako python3-json \
 	python3-misc \
Signature · 1 line
2.34.1
#4 lore raw

Re: [OE-core] [PATCH 4/5] piglit: upgrade to latest revision

Quoted 32 lines · Ross Burton

Also disable any attempt at debug splitting/stripping. Piglit installs over 2GB of files which we install stripped, so the action of attempting to split/strip takes a long time and achieves nothing.

---
 meta/recipes-graphics/piglit/piglit_git.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-graphics/piglit/piglit_git.bb +0 -0
index f758208c6bc..c9cf5795e99 100644
@@ -14,7 +14,7 @@ SRC_URI = "git://

gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma

            "

UPSTREAM_CHECK_COMMITS = "1"

meta/recipes-graphics/piglit/piglit_git.bb +2 -2
-SRCREV = "265896c86f90cb72e8f218ba6a3617fca8b9a1e3"
+SRCREV = "80465078a0ae8f12411db66850ee14f017962fa7"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr${SRCPV}"
@@ -52,8 +52,10 @@ do_configure:prepend() {
    fi
 }
 
-# Forcibly strip because Piglit is *huge*
+# Forcibly strip because Piglit is *huge*, and don't bother trying to

split/strip the result.
OECMAKE_TARGET_INSTALL = "install/strip"

meta/recipes-graphics/piglit/piglit_git.bb do_configure:prepend() { · line 58

Quoted 2 lines
meta/recipes-graphics/piglit/piglit_git.bb +2 -0
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"

How does debugging piglet looks like after this change ? I wonder if we can reduce debug info by
Using something like -g1 maybe a good middle ground

Quoted 18 lines
 RDEPENDS:${PN} = "waffle waffle-bin python3 python3-mako python3-json \
        python3-misc \

--
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#171384):
https://lists.openembedded.org/g/openembedded-core/message/171384
Mute This Topic: https://lists.openembedded.org/mt/94110619/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#5 lore raw

Re: [OE-core] [PATCH 4/5] piglit: upgrade to latest revision

Quoted 2 lines · Khem Raj via lists.openembedded.org

How does debugging piglet looks like after this change ? I wonder if we can reduce debug info by Using something like -g1 maybe a good middle ground

The binaries have been stripped since 2016, this change simply stops do_package from trying to split/strip the debug symbols. There’s 2GB of already-stripped binaries to process, which on my machine takes over a minute.

Ross

#6 lore raw

Re: [OE-core] [PATCH 4/5] piglit: upgrade to latest revision

Quoted 6 lines · Ross Burton
Quoted 2 lines · Khem Raj via lists.openembedded.org

How does debugging piglet looks like after this change ? I wonder if we can reduce debug info by Using something like -g1 maybe a good middle ground

The binaries have been stripped since 2016, this change simply stops do_package from trying to split/strip the debug symbols. There’s 2GB of already-stripped binaries to process, which on my machine takes over a minute.

yeah understood, I was trying to see if we can make it optimize a bit while you were here.

Quoted 2 lines

Ross

#7 lore raw

Re: [OE-core] [PATCH 4/5] piglit: upgrade to latest revision

Quoted 11 lines · Khem Raj
Quoted 6 lines · Ross Burton
Quoted 2 lines · Khem Raj via lists.openembedded.org

How does debugging piglet looks like after this change ? I wonder if we can reduce debug info by Using something like -g1 maybe a good middle ground

The binaries have been stripped since 2016, this change simply stops do_package from trying to split/strip the debug symbols. There’s 2GB of already-stripped binaries to process, which on my machine takes over a minute.

yeah understood, I was trying to see if we can make it optimize a bit while you were here.

Turning on any form of debug would make that 2GB more like 3GB…

Ross

#8 lore raw

Re: [OE-core] [PATCH 4/5] piglit: upgrade to latest revision

Quoted 9 lines · Ross Burton
Quoted 7 lines · Khem Raj
Quoted 5 lines · Ross Burton
Quoted 2 lines · Khem Raj via lists.openembedded.org

How does debugging piglet looks like after this change ? I wonder if we can reduce debug info by Using something like -g1 maybe a good middle ground

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

The binaries have been stripped since 2016, this change simply stops do_package from trying to split/strip the debug symbols. There’s 2GB of already-stripped binaries to process, which on my machine takes over a minute.

yeah understood, I was trying to see if we can make it optimize a bit while you were here.

Turning on any form of debug would make that 2GB more like 3GB…

hmm yeah I guess. Ignore me.

Quoted 2 lines

Ross

#9 lore raw

PATCH 5/5 lsof: upgrade 4.95.0 -> 4.96.3

In reply to Ross Burton
---
 ...on.patch => remove-host-information.patch} | 68 +++++++++++--------
 .../lsof/{lsof_4.95.0.bb => lsof_4.96.3.bb}   | 11 +--
 2 files changed, 42 insertions(+), 37 deletions(-)
 rename meta/recipes-extended/lsof/files/{lsof-remove-host-information.patch => remove-host-information.patch} (53%)
 rename meta/recipes-extended/lsof/{lsof_4.95.0.bb => lsof_4.96.3.bb} (72%)
meta/recipes-extended/lsof/files/remove-host-information.patch renamed from meta/recipes-extended/lsof/files/lsof-remove-host-information.patch +40 -28
similarity index 53%
rename from meta/recipes-extended/lsof/files/lsof-remove-host-information.patch
rename to meta/recipes-extended/lsof/files/remove-host-information.patch
index 08f083cf83c..fb90366ffa3 100644
@@ -1,35 +1,29 @@
-From 4233b5ac1629c225a7a80f33efc0eff527a95851 Mon Sep 17 00:00:00 2001
-From: Li Wang <[email protected]>
-Date: Wed, 30 Aug 2017 15:05:16 +0800
-Subject: [PATCH] Remove host information from version.h
+lsof doesn't embed the username or hostname in the build if SOURCE_DATE_EPOCH is
+defined, but this still embeds build paths.  Delete all of the host details to
+ensure that no host information is leaked into the binary.
 
-make lsof not include host information
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Li Wang <[email protected]>
-
----
- dialects/linux/Makefile | 48 +++++++----------------------------------
- 1 file changed, 8 insertions(+), 40 deletions(-)
+Upstream-Status: Inappropriate
+Signed-off-by: Ross Burton <[email protected]>
 
 diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile
-index 46c83c2..50f03cc 100644
+index 176a4c2..ef5a633 100644
 --- a/dialects/linux/Makefile
 +++ b/dialects/linux/Makefile
-@@ -84,47 +84,15 @@ version.h:	FRC
+@@ -83,64 +83,17 @@ ${LIB}: FRC
+ version.h:	FRC
  	@echo Constructing version.h
  	@rm -f version.h
- 	@echo '#define	LSOF_BLDCMT	"${LSOF_BLDCMT}"' > version.h;
+-	@echo '#define	LSOF_BLDCMT	"${LSOF_BLDCMT}"' > version.h;
 -	@echo '#define	LSOF_CC		"${CC}"' >> version.h
 -	@echo '#define	LSOF_CCV	"${CCV}"' >> version.h
 -	@echo '#define	LSOF_CCFLAGS	"'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h
-+	@echo '#define	LSOF_CC		""' >> version.h
-+	@echo '#define	LSOF_CCV	""' >> version.h
-+	@echo '#define	LSOF_CCFLAGS	""' >> version.h
- 	@echo '#define	LSOF_CINFO	"${CINFO}"' >> version.h
+-	@echo '#define	LSOF_CINFO	"${CINFO}"' >> version.h
 -	@if [ "X${LSOF_HOST}" = "X" ]; then \
--	  echo '#define	LSOF_HOST	"'`uname -n`'"' >> version.h; \
+-	  if [ "X${SOURCE_DATE_EPOCH}" = "X" ]; then \
+-	    echo '#define	LSOF_HOST	"'`uname -n`'"' >> version.h; \
+-	  else \
+-	    echo '#define	LSOF_HOST	""' >> version.h; \
+-	  fi \
 -	else \
 -	  if [ "${LSOF_HOST}" = "none" ]; then \
 -	    echo '#define	LSOF_HOST	""' >> version.h; \
@@ -39,7 +33,11 @@ index 46c83c2..50f03cc 100644
 -	fi
 -	@echo '#define	LSOF_LDFLAGS	"${CFGL}"' >> version.h
 -	@if [ "X${LSOF_LOGNAME}" = "X" ]; then \
--	  echo '#define	LSOF_LOGNAME	"${LOGNAME}"' >> version.h; \
+-	  if [ "X${SOURCE_DATE_EPOCH}" = "X" ]; then \
+-	    echo '#define	LSOF_LOGNAME	"${LOGNAME}"' >> version.h; \
+-	  else \
+-	    echo '#define	LSOF_LOGNAME	""' >> version.h; \
+-	  fi \
 -	else \
 -	  if [ "${LSOF_LOGNAME}" = "none" ]; then \
 -	    echo '#define	LSOF_LOGNAME	""' >> version.h; \
@@ -48,7 +46,11 @@ index 46c83c2..50f03cc 100644
 -	  fi; \
 -	fi
 -	@if [ "X${LSOF_SYSINFO}" = "X" ]; then \
+-	  if [ "X${SOURCE_DATE_EPOCH}" = "X" ]; then \
 -	    echo '#define	LSOF_SYSINFO	"'`uname -a`'"' >> version.h; \
+-	  else \
+-	    echo '#define	LSOF_SYSINFO	""' >> version.h; \
+-	  fi \
 -	else \
 -	  if [ "${LSOF_SYSINFO}" = "none" ]; then \
 -	    echo '#define	LSOF_SYSINFO	""' >> version.h; \
@@ -57,7 +59,11 @@ index 46c83c2..50f03cc 100644
 -	  fi \
 -	fi
 -	@if [ "X${LSOF_USER}" = "X" ]; then \
--	  echo '#define	LSOF_USER	"${USER}"' >> version.h; \
+-	  if [ "X${SOURCE_DATE_EPOCH}" = "X" ]; then \
+-	    echo '#define	LSOF_USER	"${USER}"' >> version.h; \
+-	  else \
+-	    echo '#define	LSOF_USER	""' >> version.h; \
+-	  fi \
 -	else \
 -	  if [ "${LSOF_USER}" = "none" ]; then \
 -	    echo '#define	LSOF_USER	""' >> version.h; \
@@ -65,11 +71,17 @@ index 46c83c2..50f03cc 100644
 -	    echo '#define	LSOF_USER	"${LSOF_USER}"' >> version.h; \
 -	  fi \
 -	fi
-+	@echo '#define	LSOF_HOST	""' >> version.h;
-+	@echo '#define	LSOF_LDFLAGS	""' >> version.h
-+	@echo '#define	LSOF_LOGNAME	""' >> version.h;
-+	@echo '#define	LSOF_SYSINFO	""' >> version.h;
-+	@echo '#define	LSOF_USER	""' >> version.h;
++
++	@echo '#define	LSOF_BLDCMT	""' > version.h;
++	@echo '#define	LSOF_CC		""' >> version.h
++	@echo '#define	LSOF_CCV	""' >> version.h
++	@echo '#define	LSOF_CCFLAGS	""' >> version.h
++	@echo '#define	LSOF_CINFO	""' >> version.h
++	@echo '#define	LSOF_HOST	""' >> version.h
++	@echo '#define	LSOF_LDFLAGS ""' >> version.h
++	@echo '#define	LSOF_LOGNAME	""' >> version.h
++	@echo '#define	LSOF_SYSINFO	""' >> version.h
++	@echo '#define	LSOF_USER	""' >> version.h
  	@sed '/VN/s/.ds VN \(.*\)/#define	LSOF_VERSION	"\1"/' < version >> version.h
  
  FRC:
meta/recipes-extended/lsof/lsof_4.96.3.bb renamed from meta/recipes-extended/lsof/lsof_4.95.0.bb +2 -9
similarity index 72%
rename from meta/recipes-extended/lsof/lsof_4.95.0.bb
rename to meta/recipes-extended/lsof/lsof_4.96.3.bb
index f380de0b6b0..c32fcd5583d 100644
@@ -6,16 +6,9 @@ SECTION = "devel"
 LICENSE = "Spencer-94"
 LIC_FILES_CHKSUM = "file://00README;beginline=645;endline=679;md5=964df275d26429ba3b39dbb9f205172a"
 
-# Upstream lsof releases are hosted on an ftp server which times out download
-# attempts from hosts for which it can not perform a DNS reverse-lookup (See:
-# https://people.freebsd.org/~abe/ ). http://www.mirrorservice.org seems to be
-# the most commonly used alternative.
-
 SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \
-           file://lsof-remove-host-information.patch \
-          "
-
-SRCREV = "67d8c828e7bdc01ba93f8ff79765dd424da0c9d7"
+           file://remove-host-information.patch"
+SRCREV = "eec10fac8f57544e26ff00bf41a2dc09c56049bf"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.34.1