openeuler-ci-bot
Gitee
commit
d2a62f52f7
@ -1,52 +0,0 @@
|
||||
From 40af0db4cdadc50d9ba7ea77d8fa0689bf976f9f Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Thu, 5 Sep 2019 12:34:01 +0200
|
||||
Subject: [PATCH] fdisk: fix quit dialog for non-libreadline version
|
||||
|
||||
We need to clear stdin errors otherwise it returns EOF forever after
|
||||
CTRL+D.
|
||||
|
||||
Reported-by: Lukas Czerner <lczerner@redhat.com>
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
disk-utils/fdisk.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
|
||||
index 81334d0..0502fa3 100644
|
||||
--- a/disk-utils/fdisk.c
|
||||
+++ b/disk-utils/fdisk.c
|
||||
@@ -109,6 +109,7 @@ int get_user_reply(const char *prompt, char *buf, size_t bufsz)
|
||||
if (is_interactive)
|
||||
rl_callback_handler_install(prompt, reply_linehandler);
|
||||
#endif
|
||||
+ errno = 0;
|
||||
reply_running = 1;
|
||||
do {
|
||||
int rc;
|
||||
@@ -158,6 +159,7 @@ int get_user_reply(const char *prompt, char *buf, size_t bufsz)
|
||||
if (!*buf) {
|
||||
DBG(ASK, ul_debug("cancel by CTRL+D"));
|
||||
ret = -ECANCELED;
|
||||
+ clearerr(stdin);
|
||||
goto done;
|
||||
}
|
||||
|
||||
@@ -168,13 +170,13 @@ int get_user_reply(const char *prompt, char *buf, size_t bufsz)
|
||||
if (sz && *(buf + sz - 1) == '\n')
|
||||
*(buf + sz - 1) = '\0';
|
||||
|
||||
- DBG(ASK, ul_debug("user's reply: >>>%s<<<", buf));
|
||||
done:
|
||||
#ifdef HAVE_LIBREADLINE
|
||||
if (is_interactive)
|
||||
rl_callback_handler_remove();
|
||||
#endif
|
||||
sigaction(SIGINT, &oldact, NULL);
|
||||
+ DBG(ASK, ul_debug("user's reply: >>>%s<<< [rc=%d]", buf, ret));
|
||||
return ret;
|
||||
}
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
From 6f00af5b3c7aadd1322424a84661cfdac83146eb Mon Sep 17 00:00:00 2001
|
||||
From: John Garry <john.garry@huawei.com>
|
||||
Date: Tue, 8 Oct 2019 21:12:21 +0800
|
||||
Subject: [PATCH] lscpu: Add HiSilicon aarch64 tsv110 cpupart
|
||||
|
||||
Add an entry for the HiSilicon aarch64 part tsv110.
|
||||
|
||||
Another known alias for this part is TaishanV110, and it can be
|
||||
found in the Kunpeng920/Hi1620 SoC.
|
||||
|
||||
Signed-off-by: John Garry <john.garry@huawei.com>
|
||||
---
|
||||
sys-utils/lscpu-arm.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/sys-utils/lscpu-arm.c b/sys-utils/lscpu-arm.c
|
||||
index fd9ab3f..b45cbe3 100644
|
||||
--- a/sys-utils/lscpu-arm.c
|
||||
+++ b/sys-utils/lscpu-arm.c
|
||||
@@ -170,6 +170,11 @@ static const struct id_part intel_part[] = {
|
||||
{ -1, "unknown" },
|
||||
};
|
||||
|
||||
+static const struct id_part hisi_part[] = {
|
||||
+ { 0xd01, "tsv110" },
|
||||
+ { -1, "unknown" },
|
||||
+};
|
||||
+
|
||||
static const struct id_part unknown_part[] = {
|
||||
{ -1, "unknown" },
|
||||
};
|
||||
@@ -185,6 +190,7 @@ static const struct hw_impl hw_implementer[] = {
|
||||
{ 0x42, brcm_part, "Broadcom" },
|
||||
{ 0x43, cavium_part, "Cavium" },
|
||||
{ 0x44, dec_part, "DEC" },
|
||||
+ { 0x48, hisi_part, "HiSilicon" },
|
||||
{ 0x4e, nvidia_part, "Nvidia" },
|
||||
{ 0x50, apm_part, "APM" },
|
||||
{ 0x51, qcom_part, "Qualcomm" },
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
Binary file not shown.
BIN
util-linux-2.35.1.tar.xz
Normal file
BIN
util-linux-2.35.1.tar.xz
Normal file
Binary file not shown.
@ -1,8 +1,8 @@
|
||||
%define compldir %{_datadir}/bash-completion/completions/
|
||||
|
||||
Name: util-linux
|
||||
Version: 2.34
|
||||
Release: 8
|
||||
Version: 2.35.1
|
||||
Release: 1
|
||||
Summary: A random collection of Linux utilities
|
||||
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
||||
URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
|
||||
@ -35,11 +35,9 @@ Provides: /sbin/blockdev /sbin/findfs /sbin/fsck /sbin/nologin
|
||||
Obsoletes: eject <= 2.1.5 rfkill <= 0.5 util-linux-ng < 2.19
|
||||
|
||||
Patch0000: 2.28-login-lastlog-create.patch
|
||||
Patch0001: fdisk-fix-quit-dialog-for-non-libreadline-version.patch
|
||||
Patch0002: libmount-move-already-mounted-code-to-separate-funct.patch
|
||||
Patch0003: libmount-try-read-only-mount-on-write-protected-supe.patch
|
||||
Patch0004: lscpu-Add-HiSilicon-aarch64-tsv110-cpupart.patch
|
||||
Patch0005: lscpu-use-official-name-for-HiSilicon-tsv110.patch
|
||||
Patch0001: libmount-move-already-mounted-code-to-separate-funct.patch
|
||||
Patch0002: libmount-try-read-only-mount-on-write-protected-supe.patch
|
||||
Patch0003: lscpu-use-official-name-for-HiSilicon-tsv110.patch
|
||||
|
||||
%description
|
||||
The util-linux package contains a random collection of files that
|
||||
@ -296,7 +294,7 @@ fi
|
||||
%{_bindir}/{flock,getopt,hexdump,ionice,ipcmk,ipcrm,ipcs,isosize,kill,last,lastb,logger,hardlink}
|
||||
%{_bindir}/{look,lsblk,lscpu,lsipc,lslocks,lslogins,lsmem,lsns,mcookie,mesg,more,mountpoint}
|
||||
%{_bindir}/{namei,nsenter,prlimit,raw,rename,renice,rev,script,scriptreplay,setarch,setpriv}
|
||||
%{_bindir}/{setsid,setterm,taskset,ul,unshare,utmpdump,uuidgen,uuidparse,wall,wdctl,whereis}
|
||||
%{_bindir}/{setsid,setterm,taskset,ul,unshare,utmpdump,uuidgen,uuidparse,wall,wdctl,whereis,scriptlive}
|
||||
%{_sbindir}/{addpart,agetty,blkdiscard,blkid,blkzone,blockdev,chcpu,ctrlaltdel,delpart,fdisk}
|
||||
%{_sbindir}/{findfs,fsck,fsck.cramfs,fsck.minix,fsfreeze,fstrim,ldattach,losetup,mkfs,mkfs.cramfs}
|
||||
%{_sbindir}/{mkfs.minix,mkswap,nologin,partx,pivot_root,readprofile,resizepart,rfkill,rtcwake}
|
||||
@ -312,7 +310,7 @@ fi
|
||||
%{compldir}/{resizepart,rev,rfkill,rtcwake,runuser,script,scriptreplay,setarch}
|
||||
%{compldir}/{setpriv,setsid,setterm,su,swaplabel,swapoff,swapon,taskset,ul,unshare}
|
||||
%{compldir}/{utmpdump,uuidgen,uuidparse,wall,wdctl,whereis,wipefs,write,zramctl}
|
||||
%{compldir}/{fdformat,hwclock,cfdisk,sfdisk}
|
||||
%{compldir}/{fdformat,hwclock,cfdisk,sfdisk,scriptlive}
|
||||
|
||||
%files -n libfdisk
|
||||
%license Documentation/licenses/COPYING.LGPL-2.1* libfdisk/COPYING
|
||||
@ -370,7 +368,7 @@ fi
|
||||
%{_mandir}/man1/{kill.1*,last.1*,lastb.1*,logger.1*,login.1*,look.1*,lscpu.1*,lsipc.1*,lslogins.1*,lsmem.1*}
|
||||
%{_mandir}/man1/{mcookie.1*,mesg.1*,more.1*,mountpoint.1*,namei.1*,nsenter.1*,prlimit.1*,rename.1*,renice.1*}
|
||||
%{_mandir}/man1/{rev.1*,runuser.1*,script.1*,scriptreplay.1*,setpriv.1*,setsid.1*,setterm.1*,su.1*,taskset.1*}
|
||||
%{_mandir}/man1/{ul.1*,unshare.1*,utmpdump.1.gz,uuidgen.1*,uuidparse.1*,wall.1*,whereis.1*,write.1*,choom.1*}
|
||||
%{_mandir}/man1/{ul.1*,unshare.1*,utmpdump.1.gz,uuidgen.1*,uuidparse.1*,wall.1*,whereis.1*,write.1*,choom.1*,scriptlive*}
|
||||
%{_mandir}/man3/{libblkid.3*,uuid.3*,uuid_clear.3*,uuid_compare.3*,uuid_copy.3*,uuid_generate.3*,uuid_generate_random.3*}
|
||||
%{_mandir}/man3/{uuid_generate_time_safe.3*,uuid_is_null.3*,uuid_parse.3*,uuid_time.3*,uuid_unparse.3*,uuid_generate_time.3*}
|
||||
%{_mandir}/man5/{fstab.5*,terminal-colors.d.5*,adjtime_config.5.*}
|
||||
@ -383,6 +381,12 @@ fi
|
||||
%{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*}
|
||||
|
||||
%changelog
|
||||
* Mon May 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.35.1-1
|
||||
- Type:requirement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:update to 2.35.1
|
||||
|
||||
* Sun Mar 22 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.34-8
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user