Hello community, here is the log from the commit of package mmc-utils for openSUSE:Factory checked in at 2018-03-09 10:45:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mmc-utils (Old) and /work/SRC/openSUSE:Factory/.mmc-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mmc-utils" Fri Mar 9 10:45:13 2018 rev:9 rq:584239 version:0.1+git.20180216 Changes: -------- --- /work/SRC/openSUSE:Factory/mmc-utils/mmc-utils.changes 2017-04-12 18:15:00.008275066 +0200 +++ /work/SRC/openSUSE:Factory/.mmc-utils.new/mmc-utils.changes 2018-03-09 10:45:45.024505625 +0100 @@ -1,0 +2,13 @@ +Thu Mar 8 09:49:09 UTC 2018 - mplus...@suse.com + +- Update to version 0.1+git.20180216: + * mmc-utils: manpage: fix arguments for TH macro + * mmc-utils: remove unused #includes + * mmc-utils: move offsetof from mmc.h to only user + * mmc-utils: expand .gitignore + * mmc-utils: make use of dependency information generated by gcc + * mmc-utils: drop unused header + * mmc-utils: drop macro CHECK +- Drop do_not_use_asm_generic.patch + +------------------------------------------------------------------- Old: ---- do_not_use_asm_generic.patch mmc-utils-0.1+git.20170320.tar.xz New: ---- mmc-utils-0.1+git.20180216.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mmc-utils.spec ++++++ --- /var/tmp/diff_new_pack.0QVl8K/_old 2018-03-09 10:45:45.916473497 +0100 +++ /var/tmp/diff_new_pack.0QVl8K/_new 2018-03-09 10:45:45.920473353 +0100 @@ -1,7 +1,7 @@ # # spec file for package mmc-utils # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,14 @@ Name: mmc-utils -Version: 0.1+git.20170320 +Version: 0.1+git.20180216 Release: 0 Summary: Tools for MMC/SD devices -License: GPL-2.0 +License: GPL-2.0-only Group: Hardware/Other -Url: http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/ +URL: http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/ Source0: %{name}-%{version}.tar.xz Source1: https://www.gnu.org/licenses/gpl-2.0.txt -Patch0: do_not_use_asm_generic.patch -BuildRequires: xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Userspace tools for controlling and querying MMC/SD storage devices @@ -35,7 +32,6 @@ %prep %setup -q cp %{SOURCE1} LICENSE.GPL-2.0 -%patch0 -p1 %build export CFLAGS="%{optflags}" @@ -47,8 +43,7 @@ %{buildroot}%{_mandir}/man1/mmc.1 %files -%defattr(-,root,root) -%doc LICENSE.GPL-2.0 +%license LICENSE.GPL-2.0 %{_bindir}/mmc %{_mandir}/man1/mmc.1%{ext_man} ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.0QVl8K/_old 2018-03-09 10:45:45.968471624 +0100 +++ /var/tmp/diff_new_pack.0QVl8K/_new 2018-03-09 10:45:45.968471624 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git</param> - <param name="changesrevision">37c86e60c0442fef570b75cd81aeb1db4d0cbafd</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">7bcad171173fd9a9401e7ce81906605bd6f4eddc</param></service></servicedata> \ No newline at end of file ++++++ mmc-utils-0.1+git.20170320.tar.xz -> mmc-utils-0.1+git.20180216.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mmc-utils-0.1+git.20170320/Makefile new/mmc-utils-0.1+git.20180216/Makefile --- old/mmc-utils-0.1+git.20170320/Makefile 2017-03-20 14:58:49.000000000 +0100 +++ new/mmc-utils-0.1+git.20180216/Makefile 2018-02-17 02:19:47.000000000 +0100 @@ -52,4 +52,6 @@ $(INSTALL) -m755 -d $(DESTDIR)$(bindir) $(INSTALL) $(progs) $(DESTDIR)$(bindir) +-include $(foreach obj,$(objects), $(dir $(obj))/.$(notdir $(obj)).d) + .PHONY: all clean install manpages install-man diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mmc-utils-0.1+git.20170320/lsmmc.c new/mmc-utils-0.1+git.20180216/lsmmc.c --- old/mmc-utils-0.1+git.20170320/lsmmc.c 2017-03-20 14:58:49.000000000 +0100 +++ new/mmc-utils-0.1+git.20180216/lsmmc.c 2018-02-17 02:19:47.000000000 +0100 @@ -2348,8 +2348,10 @@ struct config config; int ret; - CHECK(argc != 2 && argc != 3, "Usage: Print CSD data from <device path>.\n", - exit(1)); + if (argc != 2 && argc != 3) { + fprintf(stderr, "Usage: Print CSD data from <device path>.\n"); + exit(1); + } ret = lsmmc_main(&config, argc, argv); if (ret) @@ -2369,8 +2371,10 @@ struct config config; int ret; - CHECK(argc != 2 && argc != 3, "Usage: Print CID data from <device path>.\n", - exit(1)); + if (argc != 2 && argc != 3) { + fprintf(stderr, "Usage: Print CID data from <device path>.\n"); + exit(1); + } ret = lsmmc_main(&config, argc, argv); if (ret) @@ -2390,8 +2394,10 @@ struct config config; int ret; - CHECK(argc != 2 && argc != 3, "Usage: Print SCR data from <device path>.\n", - exit(1)); + if (argc != 2 && argc != 3) { + fprintf(stderr, "Usage: Print SCR data from <device path>.\n"); + exit(1); + } ret = lsmmc_main(&config, argc, argv); if (ret) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mmc-utils-0.1+git.20170320/man/mmc.1 new/mmc-utils-0.1+git.20180216/man/mmc.1 --- old/mmc-utils-0.1+git.20170320/man/mmc.1 2017-03-20 14:58:49.000000000 +0100 +++ new/mmc-utils-0.1+git.20180216/man/mmc.1 2018-02-17 02:19:47.000000000 +0100 @@ -1,4 +1,4 @@ -.TH man 1 "16 November 2015" "0.1" "mmc-utils man page" +.TH MMC 1 "2015-11-16" "0.1" "mmc-utils" .SH NAME mmc-utils \- Configure MMC storage devices from userspace. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mmc-utils-0.1+git.20170320/mmc.h new/mmc-utils-0.1+git.20180216/mmc.h --- old/mmc-utils-0.1+git.20170320/mmc.h 2017-03-20 14:58:49.000000000 +0100 +++ new/mmc-utils-0.1+git.20180216/mmc.h 2018-02-17 02:19:47.000000000 +0100 @@ -17,15 +17,7 @@ * those modifications are Copyright (c) 2016 SanDisk Corp. */ -#include <asm-generic/int-ll64.h> #include <linux/mmc/ioctl.h> -#include <stdio.h> - -#define CHECK(expr, msg, err_stmt) { if (expr) { fprintf(stderr, msg); err_stmt; } } - -#ifndef offsetof -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) -#endif /* From kernel linux/major.h */ #define MMC_BLOCK_MAJOR 179 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mmc-utils-0.1+git.20170320/mmc_cmds.c new/mmc-utils-0.1+git.20180216/mmc_cmds.c --- old/mmc-utils-0.1+git.20170320/mmc_cmds.c 2017-03-20 14:58:49.000000000 +0100 +++ new/mmc-utils-0.1+git.20180216/mmc_cmds.c 2018-02-17 02:19:47.000000000 +0100 @@ -22,22 +22,22 @@ #include <string.h> #include <sys/ioctl.h> #include <sys/types.h> -#include <dirent.h> #include <sys/stat.h> #include <unistd.h> #include <fcntl.h> -#include <libgen.h> -#include <limits.h> -#include <ctype.h> #include <errno.h> #include <stdint.h> #include <assert.h> -#include <linux/fs.h> +#include <linux/fs.h> /* for BLKGETSIZE */ #include "mmc.h" #include "mmc_cmds.h" #include "3rdparty/hmac_sha/hmac_sha2.h" +#ifndef offsetof +#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) +#endif + #define WP_BLKS_PER_QUERY 32 #define USER_WP_PERM_PSWD_DIS 0x80 @@ -231,9 +231,10 @@ int fd, ret; char *device; - CHECK(nargs != 2, - "Usage: mmc writeprotect boot get </path/to/mmcblkX>\n", - exit(1)); + if (nargs != 2) { + fprintf(stderr, "Usage: mmc writeprotect boot get </path/to/mmcblkX>\n"); + exit(1); + } device = argv[1]; @@ -260,9 +261,10 @@ int fd, ret; char *device; - CHECK(nargs != 2, - "Usage: mmc writeprotect boot set </path/to/mmcblkX>\n", - exit(1)); + if (nargs != 2) { + fprintf(stderr, "Usage: mmc writeprotect boot set </path/to/mmcblkX>\n"); + exit(1); + } device = argv[1]; @@ -325,9 +327,10 @@ __u32 last_prot = -1; int remain; - CHECK(nargs != 2, - "Usage: mmc writeprotect user get </path/to/mmcblkX>\n", - exit(1)); + if (nargs != 2) { + fprintf(stderr, "Usage: mmc writeprotect user get </path/to/mmcblkX>\n"); + exit(1); + } device = argv[1]; @@ -482,7 +485,11 @@ int fd, ret; char *device; - CHECK(nargs != 2, "Usage: mmc disable 512B emulation </path/to/mmcblkX>\n", exit(1)); + if (nargs != 2) { + fprintf(stderr, "Usage: mmc disable 512B emulation </path/to/mmcblkX>\n"); + exit(1); + } + device = argv[1]; fd = open(device, O_RDWR); @@ -528,8 +535,10 @@ char *device; int boot_area, send_ack; - CHECK(nargs != 4, "Usage: mmc bootpart enable <partition_number> " - "<send_ack> </path/to/mmcblkX>\n", exit(1)); + if (nargs != 4) { + fprintf(stderr, "Usage: mmc bootpart enable <partition_number> <send_ack> </path/to/mmcblkX>\n"); + exit(1); + } /* * If <send_ack> is 1, the device will send acknowledgment @@ -596,9 +605,10 @@ int fd, ret; char *device; - CHECK(nargs != 5, "Usage: mmc: bootbus set <boot_mode> " - "<reset_boot_bus_conditions> <boot_bus_width> <device>\n", - exit(1)); + if (nargs != 5) { + fprintf(stderr, "Usage: mmc: bootbus set <boot_mode> <reset_boot_bus_conditions> <boot_bus_width> <device>\n"); + exit(1); + } if (strcmp(argv[1], "single_backward") == 0) value |= 0; @@ -664,8 +674,10 @@ int fd, ret; char *device; - CHECK(nargs != 2, "Usage: mmc hwreset enable </path/to/mmcblkX>\n", - exit(1)); + if (nargs != 2) { + fprintf(stderr, "Usage: mmc hwreset enable </path/to/mmcblkX>\n"); + exit(1); + } device = argv[1]; @@ -723,8 +735,10 @@ int fd, ret; char *device; - CHECK(nargs != 2, "Usage: mmc bkops enable </path/to/mmcblkX>\n", - exit(1)); + if (nargs != 2) { + fprintf(stderr, "Usage: mmc bkops enable </path/to/mmcblkX>\n"); + exit(1); + } device = argv[1]; @@ -761,8 +775,10 @@ int fd, ret; char *device; - CHECK(nargs != 2, "Usage: mmc status get </path/to/mmcblkX>\n", - exit(1)); + if (nargs != 2) { + fprintf(stderr, "Usage: mmc status get </path/to/mmcblkX>\n"); + exit(1); + } device = argv[1]; @@ -963,8 +979,10 @@ unsigned int length_kib, gp_size_mult; unsigned long align; - CHECK(nargs != 7, "Usage: mmc gp create <-y|-n|-c> <length KiB> " - "<partition> <enh_attr> <ext_attr> </path/to/mmcblkX>\n", exit(1)); + if (nargs != 7) { + fprintf(stderr, "Usage: mmc gp create <-y|-n|-c> <length KiB> <partition> <enh_attr> <ext_attr> </path/to/mmcblkX>\n"); + exit(1); + } if (!strcmp("-y", argv[1])) { dry_run = 0; @@ -1089,8 +1107,10 @@ unsigned int start_kib, length_kib, enh_start_addr, enh_size_mult; unsigned long align; - CHECK(nargs != 5, "Usage: mmc enh_area set <-y|-n|-c> <start KiB> <length KiB> " - "</path/to/mmcblkX>\n", exit(1)); + if (nargs != 5) { + fprintf(stderr, "Usage: mmc enh_area set <-y|-n|-c> <start KiB> <length KiB> </path/to/mmcblkX>\n"); + exit(1); + } if (!strcmp("-y", argv[1])) { dry_run = 0; @@ -1234,8 +1254,10 @@ int partition; char *device; - CHECK(nargs != 4, "Usage: mmc write_reliability set <-y|-n|-c> " - "<partition> </path/to/mmcblkX>\n", exit(1)); + if (nargs != 4) { + fprintf(stderr,"Usage: mmc write_reliability set <-y|-n|-c> <partition> </path/to/mmcblkX>\n"); + exit(1); + } if (!strcmp("-y", argv[1])) { dry_run = 0; @@ -1297,8 +1319,10 @@ char *device; const char *str; - CHECK(nargs != 2, "Usage: mmc extcsd read </path/to/mmcblkX>\n", - exit(1)); + if (nargs != 2) { + fprintf(stderr, "Usage: mmc extcsd read </path/to/mmcblkX>\n"); + exit(1); + } device = argv[1]; @@ -1761,8 +1785,10 @@ int fd, ret; char *device; - CHECK(nargs != 2, "Usage: mmc sanitize </path/to/mmcblkX>\n", - exit(1)); + if (nargs != 2) { + fprintf(stderr, "Usage: mmc sanitize </path/to/mmcblkX>\n"); + exit(1); + } device = argv[1]; @@ -1933,8 +1959,10 @@ .req_resp = htobe16(MMC_RPMB_WRITE_KEY) }, frame_out; - CHECK(nargs != 3, "Usage: mmc rpmb write-key </path/to/mmcblkXrpmb> </path/to/key>\n", - exit(1)); + if (nargs != 3) { + fprintf(stderr, "Usage: mmc rpmb write-key </path/to/mmcblkXrpmb> </path/to/key>\n"); + exit(1); + } dev_fd = open(argv[1], O_RDWR); if (dev_fd < 0) { @@ -2013,8 +2041,10 @@ int ret, dev_fd; unsigned int cnt; - CHECK(nargs != 2, "Usage: mmc rpmb read-counter </path/to/mmcblkXrpmb>\n", - exit(1)); + if (nargs != 2) { + fprintf(stderr, "Usage: mmc rpmb read-counter </path/to/mmcblkXrpmb>\n"); + exit(1); + } dev_fd = open(argv[1], O_RDWR); if (dev_fd < 0) { @@ -2046,8 +2076,10 @@ .req_resp = htobe16(MMC_RPMB_READ), }, *frame_out_p; - CHECK(nargs != 5 && nargs != 6, "Usage: mmc rpmb read-block </path/to/mmcblkXrpmb> <address> <blocks count> </path/to/output_file> [/path/to/key]\n", - exit(1)); + if (nargs != 5 && nargs != 6) { + fprintf(stderr, "Usage: mmc rpmb read-block </path/to/mmcblkXrpmb> <address> <blocks count> </path/to/output_file> [/path/to/key]\n"); + exit(1); + } dev_fd = open(argv[1], O_RDWR); if (dev_fd < 0) { @@ -2195,8 +2227,10 @@ .block_count = htobe16(1) }, frame_out; - CHECK(nargs != 5, "Usage: mmc rpmb write-block </path/to/mmcblkXrpmb> <address> </path/to/input_file> </path/to/key>\n", - exit(1)); + if (nargs != 5) { + fprintf(stderr, "Usage: mmc rpmb write-block </path/to/mmcblkXrpmb> <address> </path/to/input_file> </path/to/key>\n"); + exit(1); + } dev_fd = open(argv[1], O_RDWR); if (dev_fd < 0) { @@ -2300,8 +2334,10 @@ int fd, ret; char *device; - CHECK(nargs != 2, "Usage: mmc cache enable </path/to/mmcblkX>\n", - exit(1)); + if (nargs != 2) { + fprintf(stderr, "Usage: mmc cache enable </path/to/mmcblkX>\n"); + exit(1); + } device = argv[1]; @@ -2373,8 +2409,10 @@ char *device; struct mmc_ioc_multi_cmd *multi_cmd; - CHECK(nargs != 3, "Usage: ffu <image name> </path/to/mmcblkX> \n", - exit(1)); + if (nargs != 3) { + fprintf(stderr, "Usage: ffu <image name> </path/to/mmcblkX> \n"); + exit(1); + } device = argv[2]; dev_fd = open(device, O_RDWR);
