mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-26 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

openssh: drop add-test-support-for-busybox.patch

Browse Source 
The ptest package is nowadays depending on coreutils
so busybox tweaks are both incomplete and unneeded.

(From OE-Core rev: 2408b0b5ea3090fd151de22c91420210fd7ff48f)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2024-06-19 10:59:50 +02:00
committed by Richard Purdie
parent de735e1610
commit 6f9820f198
2 changed files with 0 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
View File

@@ -1,47 +0,0 @@
Adjust test cases to work with busybox.
- Replace dd parameter "obs" with "bs".
- Replace "head -<num>" with "head -n <num>".
Signed-off-by: Maxin B. John <maxin.john@enea.com>
Upstream-Status: Pending
Index: openssh-7.6p1/regress/cipher-speed.sh
===================================================================
--- openssh-7.6p1.orig/regress/cipher-speed.sh
+++ openssh-7.6p1/regress/cipher-speed.sh
@@ -17,7 +17,7 @@ for c in `${SSH} -Q cipher`; do n=0; for
printf "%-60s" "$c/$m:"
( ${SSH} -o 'compression no' \
-F $OBJ/ssh_proxy -m $m -c $c somehost \
- exec sh -c \'"dd of=/dev/null obs=32k"\' \
+ exec sh -c \'"dd of=/dev/null bs=32k"\' \
< ${DATA} ) 2>&1 | getbytes
if [ $? -ne 0 ]; then
Index: openssh-7.6p1/regress/transfer.sh
===================================================================
--- openssh-7.6p1.orig/regress/transfer.sh
+++ openssh-7.6p1/regress/transfer.sh
@@ -13,7 +13,7 @@ cmp ${DATA} ${COPY} || fail "corrupted
for s in 10 100 1k 32k 64k 128k 256k; do
trace "dd-size ${s}"
rm -f ${COPY}
- dd if=$DATA obs=${s} 2> /dev/null | \
+ dd if=$DATA bs=${s} 2> /dev/null | \
${SSH} -q -F $OBJ/ssh_proxy somehost "cat > ${COPY}"
if [ $? -ne 0 ]; then
fail "ssh cat $DATA failed"
Index: openssh-7.6p1/regress/key-options.sh
===================================================================
--- openssh-7.6p1.orig/regress/key-options.sh
+++ openssh-7.6p1/regress/key-options.sh
@@ -47,7 +47,7 @@ for f in 127.0.0.1 '127.0.0.0\/8'; do
fi
sed 's/.*/from="'"$f"'" &/' $origkeys >$authkeys
- from=`head -1 $authkeys | cut -f1 -d ' '`
+ from=`head -n 1 $authkeys | cut -f1 -d ' '`
verbose "key option $from"
r=`${SSH} -q -F $OBJ/ssh_proxy somehost 'echo true'`
if [ "$r" = "true" ]; then

1
meta/recipes-connectivity/openssh/openssh_9.7p1.bb
View File

@@ -24,7 +24,6 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
file://run-ptest \
file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \
file://sshd_check_keys \
file://add-test-support-for-busybox.patch \
file://0001-regress-banner.sh-log-input-and-output-files-on-erro.patch \
file://0001-systemd-Add-optional-support-for-systemd-sd_notify.patch \
"