From nobody Sat Dec 18 22:40:26 2021 X-Original-To: dev-commits-ports-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 40CFC1901B9F; Sat, 18 Dec 2021 22:40:27 +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 4JGgmB73Tkz3t34; Sat, 18 Dec 2021 22:40:26 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D223517829; Sat, 18 Dec 2021 22:40:26 +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 1BIMeQlB088575; Sat, 18 Dec 2021 22:40:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BIMeQAc088574; Sat, 18 Dec 2021 22:40:26 GMT (envelope-from git) Date: Sat, 18 Dec 2021 22:40:26 GMT Message-Id: <202112182240.1BIMeQAc088574@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Marius Strobl Subject: git: b8155c2990b0 - main - sysutils/mmc-utils: Update to 20211130 version List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8155c2990b08d5f387d235f59299152f39fc162 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639867227; 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=OYpgaz5gH/035DX695LebFgDsptKhe6WoNRHLpKUOWE=; b=WiTvJP8UxfhUUGxl8NsZJeF/N6aqpdVLCKhlaZYYlDWN872eiPYX2nRk1cjNxziwcH9XQI bO8CkuasjFoFNyGtVWFcf35+cGe/K+/NbcmjzQ7Suf8ccaVMBwqbmQtPG/ugW/s4zumDVs mU0kYccF70feeFCeyvpQsXj2QSQYVZFk2dRTZTIvsYAcsBY5q8jkHWuE6D+vrUaA3Fk2g5 N4UHfyO6dFtgO+JurY5+v+cvO/jHeUVHDHCXuJgd3X9QgkbFmddXEEsL60gY0LMKVmT98f EMLTeC5akmzWv7qsfph3Etj7Pr3W8x5pk3Q6z2d9xL4OHIS9TKeGim8NDYGQUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639867227; a=rsa-sha256; cv=none; b=DJJ5WUaieVtDymrI+4HMpB4qUctfT+tsp6IU53+7BRmto78qHYIKqwHNJ3CfmK2NwzImc0 7Fs67/lAvO8wCYyWz96KB7pOQVqoJDQO7fw8yhgPUvbtBKXiiCZMfBqM0jX9qSeoQsAZiM 6XwlPe6QX96JGIBqdQrWbndLuVQT31XUMEkCRz/PYaIkeiCAbU5xcA2FysTifP8WhBklCX yxGzXgrb/Yl710RYDeLIeCjgJvy97rr+ikY7Et/OO9LssuwnxreY8xQVAXmSR69UrdCG0o 5HNENJ9Ynq2ha6O0yLm+Z+jXqQD1clSPwJi3H5MLNrG8Ff2Uwz9qm1uX1Df6Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/ports/commit/?id=b8155c2990b08d5f387d235f59299152f39fc162 commit b8155c2990b08d5f387d235f59299152f39fc162 Author: Marius Strobl AuthorDate: 2021-12-18 22:27:50 +0000 Commit: Marius Strobl CommitDate: 2021-12-18 22:40:19 +0000 sysutils/mmc-utils: Update to 20211130 version --- sysutils/mmc-utils/Makefile | 4 ++-- sysutils/mmc-utils/distinfo | 6 ++--- sysutils/mmc-utils/files/patch-man_mmc.1 | 4 ++-- sysutils/mmc-utils/files/patch-mmc.c | 18 ++++++++++++++ sysutils/mmc-utils/files/patch-mmc.h | 2 +- sysutils/mmc-utils/files/patch-mmc__cmds.c | 38 ++++++++++++++++++++++-------- 6 files changed, 54 insertions(+), 18 deletions(-) diff --git a/sysutils/mmc-utils/Makefile b/sysutils/mmc-utils/Makefile index c12815178a01..c593023d166c 100644 --- a/sysutils/mmc-utils/Makefile +++ b/sysutils/mmc-utils/Makefile @@ -1,8 +1,8 @@ # Created by: Marius Strobl PORTNAME= mmc-utils -PORTVERSION= 20191004 -DISTVERSIONSUFFIX= -73d6c59a +PORTVERSION= 20211130 +DISTVERSIONSUFFIX= -a1b233c2 CATEGORIES= sysutils MASTER_SITES= LOCAL/marius diff --git a/sysutils/mmc-utils/distinfo b/sysutils/mmc-utils/distinfo index 9321537d587e..f978889f5446 100644 --- a/sysutils/mmc-utils/distinfo +++ b/sysutils/mmc-utils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1571606199 -SHA256 (mmc-utils-20191004-73d6c59a.tar.bz2) = ec15feab72548412cdbf6112b75ade526d6bfd39e237cef4253594d07346a4db -SIZE (mmc-utils-20191004-73d6c59a.tar.bz2) = 40584 +TIMESTAMP = 1639857562 +SHA256 (mmc-utils-20211130-a1b233c2.tar.bz2) = 08580126453b7ca20988236030d98d5e59c82ebbd990a4b9bbf9a8b6dfaa59aa +SIZE (mmc-utils-20211130-a1b233c2.tar.bz2) = 42512 diff --git a/sysutils/mmc-utils/files/patch-man_mmc.1 b/sysutils/mmc-utils/files/patch-man_mmc.1 index 421843e900a1..284d221c1326 100644 --- a/sysutils/mmc-utils/files/patch-man_mmc.1 +++ b/sysutils/mmc-utils/files/patch-man_mmc.1 @@ -1,6 +1,6 @@ ---- man/mmc.1.orig 2018-02-26 22:10:51 UTC +--- man/mmc.1.orig 2021-12-18 19:59:21 UTC +++ man/mmc.1 -@@ -30,21 +30,24 @@ This sets the eMMC to be write-protected +@@ -30,21 +30,24 @@ This sets the eMMC to be write-protected until next bo Set the eMMC data sector size to 4KB by disabling emulation on . .TP diff --git a/sysutils/mmc-utils/files/patch-mmc.c b/sysutils/mmc-utils/files/patch-mmc.c new file mode 100644 index 000000000000..cf88845d082c --- /dev/null +++ b/sysutils/mmc-utils/files/patch-mmc.c @@ -0,0 +1,18 @@ +--- mmc.c.orig 2021-12-18 19:59:21 UTC ++++ mmc.c +@@ -229,6 +229,7 @@ static struct Command commands[] = { + "Run Field Firmware Update with on .\n", + NULL + }, ++#if defined(__linux__) + { do_erase, -4, + "erase", " " " " " " "\n" + "Send Erase CMD38 with specific argument to the \n\n" +@@ -237,6 +238,7 @@ static struct Command commands[] = { + "secure-trim1 | secure-trim2 | trim \n", + NULL + }, ++#endif + { 0, 0, 0, 0 } + }; + diff --git a/sysutils/mmc-utils/files/patch-mmc.h b/sysutils/mmc-utils/files/patch-mmc.h index 06e2590edf25..b1b5eab3cb51 100644 --- a/sysutils/mmc-utils/files/patch-mmc.h +++ b/sysutils/mmc-utils/files/patch-mmc.h @@ -1,4 +1,4 @@ ---- mmc.h.orig 2018-02-26 22:10:51 UTC +--- mmc.h.orig 2021-12-18 19:59:21 UTC +++ mmc.h @@ -17,10 +17,26 @@ * those modifications are Copyright (c) 2016 SanDisk Corp. diff --git a/sysutils/mmc-utils/files/patch-mmc__cmds.c b/sysutils/mmc-utils/files/patch-mmc__cmds.c index e58640a03985..fdac6beabd56 100644 --- a/sysutils/mmc-utils/files/patch-mmc__cmds.c +++ b/sysutils/mmc-utils/files/patch-mmc__cmds.c @@ -1,4 +1,4 @@ ---- mmc_cmds.c.orig 2018-12-26 19:54:04 UTC +--- mmc_cmds.c.orig 2021-12-18 19:59:21 UTC +++ mmc_cmds.c @@ -28,7 +28,12 @@ #include @@ -33,7 +33,7 @@ if (res) { fprintf(stderr, "Error getting device size, errno: %d\n", errno); -@@ -1530,13 +1546,18 @@ int do_read_extcsd(int nargs, char **arg +@@ -1605,13 +1621,18 @@ int do_read_extcsd(int nargs, char **argv) /* A441/A43: reserved [197] [195] [193] [190] [188] * [186] [184] [182] [180] [176] */ @@ -53,12 +53,30 @@ if (reg & 0x20) printf(" HS200 Single Data Rate eMMC @200MHz 1.2VI/O\n"); if (reg & 0x10) printf(" HS200 Single Data Rate eMMC @200MHz 1.8VI/O\n"); if (reg & 0x08) printf(" HS Dual Data Rate eMMC @52MHz 1.2VI/O\n"); -@@ -1883,7 +1904,7 @@ static int do_rpmb_op(int fd, - u_int16_t rpmb_type; - struct mmc_ioc_multi_cmd *mioc; - struct mmc_ioc_cmd *ioc; -- struct rpmb_frame frame_status = {0}; -+ struct rpmb_frame frame_status = {{0}}; +@@ -1881,8 +1902,10 @@ int do_read_extcsd(int nargs, char **argv) + (ext_csd[EXT_CSD_CMDQ_DEPTH] & 0x1f) + 1); + printf("Command Enabled [CMDQ_MODE_EN]: 0x%02x\n", + ext_csd[EXT_CSD_CMDQ_MODE_EN]); ++#if defined(__linux__) + printf("Note: CMDQ_MODE_EN may not indicate the runtime CMDQ ON or OFF.\n" + "Please check sysfs node '/sys/devices/.../mmc_host/mmcX/mmcX:XXXX/cmdq_en'\n"); ++#endif + } + out_free: + return ret; +@@ -2515,6 +2538,7 @@ int do_cache_dis(int nargs, char **argv) + return do_cache_ctrl(0, nargs, argv); + } + ++#if defined(__linux__) + static int erase(int dev_fd, __u32 argin, __u32 start, __u32 end) + { + int ret = 0; +@@ -2657,6 +2681,7 @@ out: + close(dev_fd); + return ret; + } ++#endif + - if (!frame_in || !frame_out || !out_cnt) - return -EINVAL; + int do_ffu(int nargs, char **argv)