meta-openembedded: subtree update:bccd3277e4..2258c9a767

Alejandro Enedino Hernandez Samaniego (1):
      gedit: Add gsettings-desktop-schemas to RDEPENDS

Alexander Vickberg (1):
      wolfssl: upgrade 4.4.0 -> 4.5.0

Andreas Müller (11):
      gnome-settings-daemon: Remove wrong RDEPEND
      gnome-desktop3: upgrade 3.36.5 -> 3.36.6
      grilo: upgrade 0.3.12 -> 0.3.13
      gspell: upgrade 1.8.3 -> 1.8.4
      libgdata: upgrade 0.17.12 -> 0.17.13
      tracker: upgrade 2.3.4 -> 2.3.6
      tracker-miners: upgrade 2.3.3 -> 2.3.5
      gjs: upgrade 1.58.7 -> 1.58.8
      xfce4-notifyd: upgrade 0.6.1 -> 0.6.2
      live555: upgrade 20200721 -> 20200819
      vlc: upgrade 3.0.11 -> 3.0.11.1

Andrey Zhizhikin (1):
      python3-pybind11: extend to native and nativesdk

Armin Kuster (3):
      cmocka: add recipe
      musl-nscd: add package
      add musl-nscd to pkg grps

Bartosz Golaszewski (2):
      libgpiod: drop support for 0.3.3
      libgpiod: consolidate the recipe files

Diego Rondini (1):
      README: fix incorrect links

Geoff Parker (1):
      multipath-tools: replace perl with sed in libdmmp/Makefile for pseudo

Gianfranco Costamagna (1):
      vboxguestdrivers: upgrade 6.1.12 -> 6.1.14 Drop kernel 5.8 compatibility patch, now part of upstream codebase

Hongxu Jia (4):
      python3-argcomplete: add recipe 1.12.0
      python3-dateutil/python3-pykwalify: add nativesdk support
      python3-pykwalify: fix missing comma
      python3-docopt: add version 0.6.2

Kai Kang (2):
      python3-iniconfig: add recipe
      python3-pytest: 5.4.3 -> 6.1.0

Khem Raj (3):
      st: Use update alternatives
      numactl: Link with libatomic on rv64/rv32
      ubi-utils-klibc: Remove trailing slash from S

Lee Chee Yang (4):
      ace : improve reproducibility
      libgphoto2: improve reproducibility
      tbb: improve reproducibility
      glog : improve reproducibility

Leon Anavi (57):
      python3-langtable: Upgrade 0.0.52 -> 0.0.53
      python3-sentry-sdk: Upgrade 0.17.5 -> 0.17.6
      python3-cmd2: Upgrade 1.3.9 -> 1.3.10
      python3-rfc3339-validator: Upgrade 0.1.1 -> 0.1.2
      python3-h2: Upgrade 3.2.0 -> 4.0.0
      python3-luma-core: Upgrade 1.16.1 -> 1.16.2
      python3-isort: Upgrade 5.5.2 -> 5.5.3
      python3-xlsxwriter: Upgrade 1.3.3 -> 1.3.4
      python3-flask-uploads: Consolidate in a single file
      python3-paho-mqtt: Upgrade 1.5.0 -> 1.5.1
      python3-sentry-sdk: Upgrade 0.17.6 -> 0.17.7
      python3-importlib-metadata: Upgrade 1.7.0 -> 2.0.0
      python3-pint: Upgrade 0.16 -> 0.16.1
      python3-zipp: Upgrade 3.1.0 -> 3.2.0
      python3-xlsxwriter: Upgrade 1.3.4 -> 1.3.5
      python3-greenlet: Upgrade 0.4.16 -> 0.4.17
      python3-xlsxwriter: Upgrade 1.3.5 -> 1.3.6
      python3-yarl: Upgrade 1.5.1 -> 1.6.0
      python3-sentry-sdk: Upgrade 0.17.7 -> 0.17.8
      python3-google-api-python-client: Upgrade 1.12.1 -> 1.12.2
      python3-cryptography: Upgrade 3.1 -> 3.1.1
      python3-cryptography-vectors: Upgrade 3.1 -> 3.1.1
      python3-gevent: Upgrade 20.6.2 -> 20.9.0
      python3-pycrypto: Consolidate in a single file
      python3-pychromecast: Upgrade 7.3.0 -> 7.5.0
      python3-beautifulsoup4: Upgrade 4.9.1 -> 4.9.2
      python3-tqdm: Upgrade 4.49.0 -> 4.50.0
      python3-argcomplete: Upgrade 1.12.0 -> 1.12.1
      python3-luma-core: Upgrade 1.16.2 -> 1.17.1
      python3-luma-oled: Upgrade 3.5.0 -> 3.6.0
      python3-regex: Upgrade 2020.7.14 -> 2020.9.27
      python3-djangorestframework: Upgrade 3.11.1 -> 3.12.1
      python3-isort: Upgrade 5.5.3 -> 5.5.4
      python3-cbor2: Upgrade 5.1.2 -> 5.2.0
      python3-humanize: Upgrade 2.6.0 -> 3.0.0
      python3-pystemd: Upgrade 0.7.0 -> 0.8.0
      python3-sentry-sdk: Upgrade 0.17.8 -> 0.18.0
      python3-nocasedict: Upgrade 1.0.0 -> 1.0.1
      python3-google-api-python-client: Upgrade 1.12.2 -> 1.12.3
      beautifulsoup4: Upgrade 4.9.2 -> 4.9.3
      python3-humanize: Upgrade 3.0.0 -> 3.0.1
      python3-zipp: Upgrade 3.2.0 -> 3.3.0
      python3-cmd2: Upgrade 1.3.10 -> 1.3.11
      python3-pywbemtools: Upgrade 0.7.1 -> 0.7.2
      python3-prettytable: Upgrade 0.7.2 -> 1.0.0
      python3-nocaselist: Upgrade 1.0.2 -> 1.0.3
      python3-pandas: Upgrade 1.1.2 -> 1.1.3
      python3-configparser: Upgrade 5.0.0 -> 5.0.1
      python3-pywbemtools: Upgrade 0.7.2 -> 0.7.3
      python3-colorlog: Upgrade 4.2.1 -> 4.4.0
      python3-markdown: Upgrade 3.2.2 -> 3.3
      python3-tqdm: Upgrade 4.50.0 -> 4.50.2
      python3-pywbem: Upgrade 1.0.2 -> 1.1.0
      python3-regex: Upgrade 2020.9.27 -> 2020.10.11
      python3-multidict: Upgrade 4.7.6 -> 5.0.0
      python3-prettytable: Upgrade 1.0.0 -> 1.0.1
      python3-pyperclip: Upgrade 1.8.0 -> 1.8.1

Lim Siew Hoon (1):
      Alliance for Open Media: new library

Martin Jansa (4):
      libhugetlbfs: revert one commit from 2.23 to work around build error on arm
      netkit-rsh: inherit update-alternatives
      ssmtp: adjust u-a
      utouch-*, ifenslave, iozone3, ttf-honkyfonts, python3-smbus: don't use trailing slash in S

Michael Vetter (3):
      jasper: use correct homepage
      jasper: upgrade 2.0.20 -> 2.0.21
      jasper: upgrade 2.0.21 -> 2.0.22

Mingli Yu (3):
      smartmontools: Remove obsolete setting regarding the Standard Output
      ippool: Remove obsolete setting in service file
      strongswan: Remove obsolete setting regarding the Standard Output

Naveen Saini (1):
      tbb: upgrade 2020.2 -> 2020.3

Pascal Bach (1):
      rocksdb: 6.6.4 -> 6.11.4

Pierre-Jean Texier (1):
      cppzmq: upgrade 4.6.0 -> 4.7.0

Ricardo Salveti (1):
      pcsc-lite: upgrade 1.8.26 -> 1.9.0

Richard Purdie (1):
      minifi-cpp: Adapt to potential psuedo changes

Robert Yang (1):
      crda: rdepends on wireless-regdb-static

Romain Naour (1):
      libiec61850: add recipe for libiec61850

Ross Burton (1):
      mpv: don't remove lua for aarch64 twice

Sakib Sajal (1):
      libssh2: enable ptest

Sinan Kaya (1):
      collectd: make rrdtool and rrdcached optional

Tim Orling (3):
      python3-markupsafe: bbappend for ptest
      python3-jinja2: bbappend for ptest
      packagegroup-meta-python: -jinja2 -markupsafe => ptest

Todd Cunningham (1):
      firewalld: upgrade 0.8.3 -> 0.9.0

Vladimir Zapolskiy (1):
      cifs-utils: remove explicitly set PV variable

Winfried Dobbe (1):
      firewalld: Add missing rdep on nftables-python

Yi Zhao (2):
      minifi-cpp: do not download source during compile
      minifi-cpp: set the default repositories location to /var/lib

Zang Ruochen (6):
      byacc: upgrade 20200330 -> 20200910
      memtester: upgrade 4.3.0 -> 4.4.0
      redis: upgrade 6.0.7 -> 6.0.8
      znc: upgrade 1.8.1 -> 1.8.2
      arno-iptables-firewall: upgrade 2.1.0 -> 2.1.1
      numactl: upgrade 2.0.13 -> 2.0.14

Zheng Ruoqin (1):
      dnf-plugin-tui: upgrade 1.1 -> 1.2

Zig Globulin (1):
      libuvc: add recipe

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I67cbdcd31a7ead9641a4bce3477ff706f33bb253

5 files changed, 214 insertions, 61 deletions

diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb
index ecf08cb33..1d2e53a31 100644
--- a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb
+++ b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "5eadb4235ae2a956911204c50ebf2d8d8d59ddcd4a2841a1baf42f3145
 
 UPSTREAM_CHECK_REGEX = "iozone3_(?P<pver>\d+).tar"
 
-S = "${WORKDIR}/${BPN}_${PV}/src/current/"
+S = "${WORKDIR}/${BPN}_${PV}/src/current"
 
 #
 # All other arches can use the default OEMAKE except those
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch
new file mode 100644
index 000000000..0787ef27d
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch
@@ -0,0 +1,210 @@
+From 0a163f60b4a316c4b6f1726a71c84755f3bd85e7 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@lge.com>
+Date: Wed, 16 Sep 2020 04:36:04 -0700
+Subject: [PATCH] Revert "ld.hugetlbfs: fix -Ttext-segment argument on AArch64"
+
+This reverts commit 852dcc963ce44861ed7c4e225aa92ff2b5b43579.
+
+* works around
+  ERROR: libhugetlbfs-1_2.23-r0 do_populate_sysroot: Fatal errors occurred in subprocesses:
+  Command '['arm-oe-linux-gnueabi-strip', '--remove-section=.comment', '--remove-section=.note', 'libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw']' returned non-zero exit status 1.
+  Subprocess output:arm-oe-linux-gnueabi-strip:
+  libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/stmuFa58: error: PHDR segment not covered by LOAD segment
+  arm-oe-linux-gnueabi-strip: libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/stmuFa58[.interp]: file format not recognized
+
+I don't see anything suspicious in the build (the same cmdline as in 2.22
+version), but it uses
+
+libhugetlbfs/1_2.22-r0-old/temp/log.do_compile:arm-oe-linux-gnueabi-gcc
+ -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1
+-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
+-fstack-protector-strong  -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
+-Werror=format-security -Werror=return-type
+--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.22-r0/recipe-sysroot
+-I.. -O2 -Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c
+libhugetlbfs/1_2.22-r0-old/temp/log.do_compile:arm-oe-linux-gnueabi-gcc
+ -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1
+-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
+-fstack-protector-strong  -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
+-Werror=format-security -Werror=return-type
+--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.22-r0/recipe-sysroot
+-B./obj32 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
+-ldl -L../obj32 -o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl
+-lhugetlbfs_privutils -Wl,--hugetlbfs-align obj32/linkhuge_rw.o
+obj32/testutils.o
+libhugetlbfs/1_2.23-r0-new/temp/log.do_compile:arm-oe-linux-gnueabi-gcc
+ -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1
+-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
+-fstack-protector-strong  -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
+-Werror=format-security -Werror=return-type
+--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.23-r0/recipe-sysroot
+-I.. -O2 -Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c
+libhugetlbfs/1_2.23-r0-new/temp/log.do_compile:arm-oe-linux-gnueabi-gcc
+ -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1
+-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
+-fstack-protector-strong  -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
+-Werror=format-security -Werror=return-type
+--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.23-r0/recipe-sysroot
+-B./obj32 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
+-ldl -L../obj32 -o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl
+-lhugetlbfs_privutils -Wl,--hugetlbfs-align obj32/linkhuge_rw.o
+obj32/testutils.o
+
+And the git log between 2.22 and 2.23 is also very short and looks
+reasonable.
+https://github.com/libhugetlbfs/libhugetlbfs/compare/2.22...2.23
+
+When checking with readelf -l it also shows the error about PHDR segment:
+arm-oe-linux-gnueabi-readelf -l
+./1_2.22-r0-old/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw
+
+Elf file type is DYN (Shared object file)
+Entry point 0x201105
+There are 10 program headers, starting at offset 52
+
+Program Headers:
+  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
+  PHDR           0x000034 0x00200034 0x00200034 0x00140 0x00140 R   0x4
+  INTERP         0x000174 0x00200174 0x00200174 0x0001d 0x0001d R   0x1
+      [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3]
+  LOAD           0x000000 0x00200000 0x00200000 0x1222c 0x1222c R E 0x200000
+  LOAD           0x1ffdf0 0x005ffdf0 0x005ffdf0 0x102e0 0x202ec RW  0x200000
+  DYNAMIC        0x1ffdf8 0x005ffdf8 0x005ffdf8 0x00128 0x00128 RW  0x4
+  NOTE           0x000194 0x00200194 0x00200194 0x00044 0x00044 R   0x4
+  GNU_EH_FRAME   0x012224 0x00212224 0x00212224 0x00008 0x00008 R   0x4
+  GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0x10
+  EXIDX          0x001c5c 0x00201c5c 0x00201c5c 0x00008 0x00008 R   0x4
+  GNU_RELRO      0x1ffdf0 0x005ffdf0 0x005ffdf0 0x00210 0x00210 RW  0x4
+
+ Section to Segment mapping:
+  Segment Sections...
+   00
+   01     .interp
+   02     .interp .note.ABI-tag .note.gnu.build-id .dynsym .dynstr
+.gnu.hash .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text
+.fini .ARM.extab .ARM.exidx .rodata .eh_frame .eh_frame_hdr
+   03     .fini_array .init_array .dynamic .got .data .bss
+   04     .dynamic
+   05     .note.ABI-tag .note.gnu.build-id
+   06     .eh_frame_hdr
+   07
+   08     .ARM.extab .ARM.exidx
+   09     .fini_array .init_array .dynamic .got
+
+arm-oe-linux-gnueabi-readelf -l
+./1_2.23-r0-new/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw
+
+Elf file type is DYN (Shared object file)
+Entry point 0x31cd1
+There are 10 program headers, starting at offset 52
+
+Program Headers:
+  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
+  PHDR           0x000000 0x00000000 0x00000000 0x00000 0x00000 R   0
+readelf: Error: the PHDR segment is not covered by a LOAD segment
+  INTERP         0x030d40 0x00030d40 0x00030d40 0x0001d 0x0001d R   0x1
+      [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3]
+  LOAD           0x030d40 0x00030d40 0x00030d40 0x120b8 0x120b8 R E 0x200000
+  LOAD           0x1ffdf0 0x003ffdf0 0x003ffdf0 0x102e0 0x202ec RW  0x200000
+  DYNAMIC        0x1ffdf8 0x003ffdf8 0x003ffdf8 0x00128 0x00128 RW  0x4
+  NOTE           0x030d60 0x00030d60 0x00030d60 0x00044 0x00044 R   0x4
+  GNU_EH_FRAME   0x042df0 0x00042df0 0x00042df0 0x00008 0x00008 R   0x4
+  GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0x10
+  EXIDX          0x032828 0x00032828 0x00032828 0x00008 0x00008 R   0x4
+  GNU_RELRO      0x1ffdf0 0x003ffdf0 0x003ffdf0 0x00210 0x00210 RW  0x4
+
+ Section to Segment mapping:
+  Segment Sections...
+   00
+   01     .interp
+   02     .interp .note.ABI-tag .note.gnu.build-id .dynsym .dynstr
+.gnu.hash .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text
+.fini .ARM.extab .ARM.exidx .rodata .eh_frame .eh_frame_hdr
+   03     .fini_array .init_array .dynamic .got .data .bss
+   04     .dynamic
+   05     .note.ABI-tag .note.gnu.build-id
+   06     .eh_frame_hdr
+   07
+   08     .ARM.extab .ARM.exidx
+   09     .fini_array .init_array .dynamic .got
+
+And the diff between these 2:
+
+1_2.22-r0-old/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw.readelf
+1_2.23-r0-new/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw.readelf
+ Elf file type is DYN (Shared object file)
+-Entry point 0x201105
++Entry point 0x31cd1
+ There are 10 program headers, starting at offset 52
+
+ Program Headers:
+   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
+-  PHDR           0x000034 0x00200034 0x00200034 0x00140 0x00140 R   0x4
+-  INTERP         0x000174 0x00200174 0x00200174 0x0001d 0x0001d R   0x1
++  PHDR           0x000000 0x00000000 0x00000000 0x00000 0x00000 R   0
++readelf: Error: the PHDR segment is not covered by a LOAD segment
++  INTERP         0x030d40 0x00030d40 0x00030d40 0x0001d 0x0001d R   0x1
+       [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3]
+-  LOAD           0x000000 0x00200000 0x00200000 0x1222c 0x1222c R E 0x200000
+-  LOAD           0x1ffdf0 0x005ffdf0 0x005ffdf0 0x102e0 0x202ec RW  0x200000
+-  DYNAMIC        0x1ffdf8 0x005ffdf8 0x005ffdf8 0x00128 0x00128 RW  0x4
+-  NOTE           0x000194 0x00200194 0x00200194 0x00044 0x00044 R   0x4
+-  GNU_EH_FRAME   0x012224 0x00212224 0x00212224 0x00008 0x00008 R   0x4
++  LOAD           0x030d40 0x00030d40 0x00030d40 0x120b8 0x120b8 R E 0x200000
++  LOAD           0x1ffdf0 0x003ffdf0 0x003ffdf0 0x102e0 0x202ec RW  0x200000
++  DYNAMIC        0x1ffdf8 0x003ffdf8 0x003ffdf8 0x00128 0x00128 RW  0x4
++  NOTE           0x030d60 0x00030d60 0x00030d60 0x00044 0x00044 R   0x4
++  GNU_EH_FRAME   0x042df0 0x00042df0 0x00042df0 0x00008 0x00008 R   0x4
+   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0x10
+-  EXIDX          0x001c5c 0x00201c5c 0x00201c5c 0x00008 0x00008 R   0x4
+-  GNU_RELRO      0x1ffdf0 0x005ffdf0 0x005ffdf0 0x00210 0x00210 RW  0x4
++  EXIDX          0x032828 0x00032828 0x00032828 0x00008 0x00008 R   0x4
++  GNU_RELRO      0x1ffdf0 0x003ffdf0 0x003ffdf0 0x00210 0x00210 RW  0x4
+
+  Section to Segment mapping:
+
+Revert fixes this build issue, but I still don't see why it fails this way.
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# Date:      Wed Sep 16 13:43:09 2020 +0200
+#
+# On branch jansa/master
+# Changes to be committed:
+#	new file:   meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch
+#	modified:   meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+#
+# Untracked files:
+#	counts.txt
+#	diff
+#	log.svn
+#	log.svn2
+#	wip/
+#
+---
+ ld.hugetlbfs | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/ld.hugetlbfs b/ld.hugetlbfs
+index 5e4e497..6ee8238 100755
+--- a/ld.hugetlbfs
++++ b/ld.hugetlbfs
+@@ -130,9 +130,7 @@ if [ "$HTLB_ALIGN" == "slice" ]; then
+ 	# targeting the ARM platform one needs to explicitly set the text segment offset
+ 	# otherwise it will be NULL.
+ 	case "$EMU" in
+-	armelf*_linux_eabi|aarch64elf*|aarch64linux*)
+-		printf -v TEXTADDR "%x" "$SLICE_SIZE"
+-		HTLBOPTS="$HTLBOPTS -Ttext-segment=$TEXTADDR" ;;
++	armelf*_linux_eabi|aarch64elf*|aarch64linux*)	HTLBOPTS="$HTLBOPTS -Ttext-segment=$SLICE_SIZE" ;;
+ 	elf_i386)		HTLBOPTS="$HTLBOPTS -Ttext-segment=0x08000000" ;;
+ 	elf64ppc|elf64lppc)
+ 		if [ "$MMU_TYPE" == "Hash" ] ; then
+-- 
+2.17.1
+
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
index b349096ec..2f07c938b 100644
--- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
@@ -25,6 +25,7 @@ SRC_URI = " \
     file://0005-Include-dirent.h-for-ino_t.patch \
     file://0006-include-limits.h-for-PATH_MAX.patch \
     file://0001-huge_page_setup_helper-use-python3-interpreter.patch \
+    file://0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch \
 "
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch b/meta-openembedded/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch
deleted file mode 100644
index ffd9b9f26..000000000
--- a/meta-openembedded/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 01f1c05702eb534271777648c976ab6402a5145b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 12 Aug 2020 23:18:30 -0700
-Subject: [PATCH] Define mword16 and mword8 once
-
-Defining them in .h meant they are defined in all .c files including
-this .h file
-
-Fixes build with gcc 10+
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- tests.c | 9 +++++++++
- types.h | 9 ---------
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/tests.c b/tests.c
-index be1b350..4305bed 100644
---- a/tests.c
-+++ b/tests.c
-@@ -27,6 +27,15 @@ char progress[] = "-\\|/";
- #define PROGRESSOFTEN 2500
- #define ONE 0x00000001L
- 
-+union {
-+    unsigned char bytes[UL_LEN/8];
-+    ul val;
-+} mword8;
-+
-+union {
-+    unsigned short u16s[UL_LEN/16];
-+    ul val;
-+} mword16;
- /* Function definitions. */
- 
- int compare_regions(ulv *bufa, ulv *bufb, size_t count) {
-diff --git a/types.h b/types.h
-index ad7ce73..e14ea32 100644
---- a/types.h
-+++ b/types.h
-@@ -25,12 +25,3 @@ struct test {
-     int (*fp)();
- };
- 
--union {
--    unsigned char bytes[UL_LEN/8];
--    ul val;
--} mword8;
--
--union {
--    unsigned short u16s[UL_LEN/16];
--    ul val;
--} mword16;
--- 
-2.28.0
-
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.4.0.bb
index 3d2905578..646ff90ba 100644
--- a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb
+++ b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.4.0.bb
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
 SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz \
            file://Makefile.patch \
-           file://0001-Define-mword16-and-mword8-once.patch \
            "
-SRC_URI[md5sum] = "598f41b7308e1f736164bca3ab84ddbe"
-SRC_URI[sha256sum] = "f9dfe2fd737c38fad6535bbab327da9a21f7ce4ea6f18c7b3339adef6bf5fd88"
+SRC_URI[md5sum] = "e1883b69cd7c0bb74ef6a475c93a4fbf"
+SRC_URI[sha256sum] = "6ffe23e6e6449b42c577c7953778fb6f698050196797a94fc619d9badc59f8e8"
 
 do_compile () {
     echo '${CC} ${CFLAGS} -DPOSIX -c' > conf-cc