From nobody Sun Feb 05 21:47:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P92zS5LW8z3ktq8; Sun, 5 Feb 2023 21:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P92zS4rVdz3jxf; Sun, 5 Feb 2023 21:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675633620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p85Z6E3e32a8aeC1KLav8Cb+vzxCl4dAN8UWr6SAKRo=; b=oi0GF4NSRTTk2vFF9ReC4hRxI1q3tDK6Fn4+lYeKCb7yI4CLoBfpZAEgkxImBiMjrQFolH 3tHU9juFFk83elHyVDC/5ii2I+2of6aHvxjFYpR2ztHKPexoyraL8mPE2EbjUlDMJZcvsl wp+uqDA8zMH3u88/LmcMcLdHIUj6E3dNmRg9v8UA8tlMI0hCBqYW+x2zn8mHWG5bfVKC/9 t5oJ6VNFLelZZHr9TDrIWZ4E04dM23gXVDq5rTKvyfIKYwkUKpg51dPuLlhCeX6GVEQddm FHMyJ1rCqs9J3EIsdEo59KEh+NFc48JRw+Fl2W9AikBteddpBh9XYGV8V3cKNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675633620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p85Z6E3e32a8aeC1KLav8Cb+vzxCl4dAN8UWr6SAKRo=; b=Ucq1DJ+sBvzy5QHTU7uPmcqcESW0FTVHtvlFJBN80u6DwpoXb6sB08svX4iyEc0OBg+Jnc /s3fDvx/Mwv7d/+Ycz2pQFbjkDBn/DnXBiIhz0hLsYMzX1+EmO01iK+ahMRblcggk0kIN7 h8vCapQvgWCFo+xdw/lTsW3B635CSaYXeabDsXLXU92XvCsKpfb88EIuJZHM52/r1UWOMP TaXcTTouESnnULS7sAS3mc+CLI9xAPkbx8riUVAh4ToVIO1+IHkKCagjx87aJrjbZyXJty 31mp77WcW9CAc6v14LTpUdZTqqRcoI4byIbs9wW4FYWljFtuFKtij1ISWK9TWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675633620; a=rsa-sha256; cv=none; b=u4vw3sfFobBjO361i6w+tcDcxURvDFUcBMdfoTPx3Qt7HPNGllf5GgrqvVfDknu1BTRYgY 0SxNQu35PZsPvUFudq978m1v+DRDDGiIdcSGXI3B8MIMAldCl8iX5n7HDAOtify6jvOrPv C9Ti5G3FnqbQSDP9n8tZ5BYmBZs5REkZeA3VtzTatsIdTwHzdu+USibC2an8kV5STYnuWh vO0HfI/yJVOusUgUUdIET6pGOAeWTW7LVRjt8bUnKQBnTJsSmlA8ot7MQkRZCZnNu7wZoT 6yF3lAi7EpaJX/hpuqM5iaJUImMnNyCbv2+2iFSjzWhPhwA4YwWqrLs8VcMrNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P92zS3vcbz198W; Sun, 5 Feb 2023 21:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 315Ll0pq048500; Sun, 5 Feb 2023 21:47:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 315Ll0rm048499; Sun, 5 Feb 2023 21:47:00 GMT (envelope-from git) Date: Sun, 5 Feb 2023 21:47:00 GMT Message-Id: <202302052147.315Ll0rm048499@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: a599eea13521 - stable/13 - release: Remove C-like string comparison operator List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a599eea13521c7d1d26bc42bc944f2ac5f6fddbf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a599eea13521c7d1d26bc42bc944f2ac5f6fddbf commit a599eea13521c7d1d26bc42bc944f2ac5f6fddbf Author: Jose Luis Duran AuthorDate: 2021-06-20 00:00:19 +0000 Commit: Colin Percival CommitDate: 2023-02-05 21:45:55 +0000 release: Remove C-like string comparison operator Per [(1), i.e. test(1), the string comparison operator should be `=`, not `==` in sh(1) scripts. No functional change. FreeBSD's test accepts `==` as an alias for `=` for compatibility with gnu test's `==` extension. Reviewed by: imp@, gjb@ Pull Request: https://github.com/freebsd/freebsd-src/pull/485 (cherry picked from commit 3f197b101f71ee4f4949c53bf330f61b43749ce9) --- release/tools/arm.subr | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/release/tools/arm.subr b/release/tools/arm.subr index 9758c898ca24..69f56c7c6520 100644 --- a/release/tools/arm.subr +++ b/release/tools/arm.subr @@ -69,13 +69,13 @@ arm_create_disk() { # Create the target raw file and temporary work directory. chroot ${CHROOTDIR} gpart create -s ${PART_SCHEME} ${mddev} - if [ "${PART_SCHEME}" == "GPT" ]; then + if [ "${PART_SCHEME}" = "GPT" ]; then chroot ${CHROOTDIR} gpart add -t efi -l efi -a 512k -s ${FAT_SIZE} ${mddev} chroot ${CHROOTDIR} newfs_msdos -L efi -F ${FAT_TYPE} /dev/${mddev}p1 chroot ${CHROOTDIR} gpart add -t freebsd-ufs -l rootfs -a 64k ${mddev} chroot ${CHROOTDIR} newfs -U -L rootfs /dev/${mddev}p2 fi - if [ "${PART_SCHEME}" == "MBR" ]; then + if [ "${PART_SCHEME}" = "MBR" ]; then chroot ${CHROOTDIR} gpart add -t '!12' -a 512k -s ${FAT_SIZE} ${mddev} chroot ${CHROOTDIR} gpart set -a active -i 1 ${mddev} chroot ${CHROOTDIR} newfs_msdos -L msdosboot -F ${FAT_TYPE} /dev/${mddev}s1 @@ -173,10 +173,10 @@ arm_setup_minimal_loader() { } arm_install_base() { - if [ "${PART_SCHEME}" == "GPT" ]; then + if [ "${PART_SCHEME}" = "GPT" ]; then chroot ${CHROOTDIR} mount /dev/${mddev}p2 ${DESTDIR} fi - if [ "${PART_SCHEME}" == "MBR" ]; then + if [ "${PART_SCHEME}" = "MBR" ]; then chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${DESTDIR} fi _OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U) @@ -200,13 +200,13 @@ arm_install_base() { echo '# Custom /etc/fstab for FreeBSD embedded images' \ > ${CHROOTDIR}/${DESTDIR}/etc/fstab - if [ "${PART_SCHEME}" == "GPT" ]; then + if [ "${PART_SCHEME}" = "GPT" ]; then echo "/dev/ufs/rootfs / ufs rw 1 1" \ >> ${CHROOTDIR}/${DESTDIR}/etc/fstab echo "/dev/msdosfs/EFI /boot/efi msdosfs rw,noatime 0 0" \ >> ${CHROOTDIR}/${DESTDIR}/etc/fstab fi - if [ "${PART_SCHEME}" == "MBR" ]; then + if [ "${PART_SCHEME}" = "MBR" ]; then echo "/dev/ufs/rootfs / ufs rw 1 1" \ >> ${CHROOTDIR}/${DESTDIR}/etc/fstab echo "/dev/msdosfs/MSDOSBOOT /boot/msdos msdosfs rw,noatime 0 0" \ @@ -236,11 +236,11 @@ arm_install_boot() { FATMOUNT="${DESTDIR%${KERNEL}}/fat" UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" - if [ "${PART_SCHEME}" == "GPT" ]; then + if [ "${PART_SCHEME}" = "GPT" ]; then dospart="/dev/${mddev}p1" ufspart="/dev/${mddev}p2" fi - if [ "${PART_SCHEME}" == "MBR" ]; then + if [ "${PART_SCHEME}" = "MBR" ]; then dospart="/dev/${mddev}s1" ufspart="/dev/${mddev}s2a" fi @@ -248,7 +248,7 @@ arm_install_boot() { chroot ${CHROOTDIR} mount_msdosfs ${dospart} ${FATMOUNT} chroot ${CHROOTDIR} mount ${ufspart} ${UFSMOUNT} - if [ "${EMBEDDED_TARGET}" == "arm" ]; then + if [ "${EMBEDDED_TARGET}" = "arm" ]; then chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ ${FATMOUNT}/ubldr.bin fi