Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
util-linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
util-linux
Commits
4f58d52e
Commit
4f58d52e
authored
May 26, 2021
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgraded util-linux to 2.35.2
parent
4ba6c129
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
22 deletions
+21
-22
Makefile
Makefile
+8
-7
build.xml
build.xml
+2
-2
util-linux-2.34-fix_lsblk_pkname.patch
util-linux-2.34-fix_lsblk_pkname.patch
+0
-13
util-linux-2.35.2-no_C.UTF-8_locale.patch
util-linux-2.35.2-no_C.UTF-8_locale.patch
+11
-0
util-linux-2.35.2.tar.xz
util-linux-2.35.2.tar.xz
+0
-0
No files found.
Makefile
View file @
4f58d52e
all
:
all
:
tar
xf util-linux-2.3
4
.tar.xz
tar
xf util-linux-2.3
5.2
.tar.xz
patch
-Np1
-d
util-linux-2.3
4 < util-linux-2.34-fix_lsblk_pknam
e.patch
patch
-Np1
-d
util-linux-2.3
5.2 < util-linux-2.35.2-no_C.UTF-8_local
e.patch
mkdir
-pv
/var/lib/hwclock
mkdir
-pv
/var/lib/hwclock
cd
util-linux-2.3
4
&&
./configure
--build
=
$(CLFS_TARGET)
ADJTIME_PATH
=
/var/lib/hwclock/adjtime
--docdir
=
/usr/share/doc/util-linux-2.34
--disable-chfn-chsh
--disable-login
--disable-nologin
--disable-su
--disable-setpriv
--disable-runuser
--disable-pylibmount
--disable-static
cd
util-linux-2.3
5.2
&&
./configure
--build
=
$(CLFS_TARGET)
ADJTIME_PATH
=
/var/lib/hwclock/adjtime
--docdir
=
/usr/share/doc/util-linux-2.35.2
--disable-chfn-chsh
--disable-login
--disable-nologin
--disable-su
--disable-setpriv
--disable-runuser
--disable-pylibmount
--disable-static
$(MAKE)
-C
util-linux-2.3
4
$(MAKE)
-C
util-linux-2.3
5.2
if
[[
!
"
$(BUILD_OPTIONS)
"
=
~ no-tests
]]
;
then
\
if
[[
!
"
$(BUILD_OPTIONS)
"
=
~ no-tests
]]
;
then
\
cd
util-linux-2.3
4
;
\
cd
util-linux-2.3
5.2
;
\
chown
-Rv
nobody
.
;
\
chown
-Rv
nobody
.
;
\
su nobody
-s
/bin/bash
-c
"PATH=
$$
PATH make -k check TS_OPTS='--exclude=script/options'"
;
\
su nobody
-s
/bin/bash
-c
"PATH=
$$
PATH make -k check TS_OPTS='--exclude=script/options'"
;
\
fi
fi
$(MAKE)
-C
util-linux-2.34
install
$(MAKE)
-C
util-linux-2.35.2
install
rm
-rf
util-linux-2.34
rm
-rf
util-linux-2.35.2
build.xml
View file @
4f58d52e
<project
name=
"util-linux"
>
<project
name=
"util-linux"
>
<target
name=
"temporary-util-linux"
>
<target
name=
"temporary-util-linux"
>
<property
name=
"makedir"
value=
"${builddir}/util-linux-2.3
4
"
/>
<property
name=
"makedir"
value=
"${builddir}/util-linux-2.3
5.2
"
/>
<exec
executable=
"tar"
failonerror=
"true"
>
<exec
executable=
"tar"
failonerror=
"true"
>
<arg
line=
"xf packages/util-linux/util-linux-2.3
4
.tar.xz -C ${builddir}"
/>
<arg
line=
"xf packages/util-linux/util-linux-2.3
5.2
.tar.xz -C ${builddir}"
/>
</exec>
</exec>
<exec
executable=
"./configure"
dir=
"${makedir}"
failonerror=
"true"
>
<exec
executable=
"./configure"
dir=
"${makedir}"
failonerror=
"true"
>
<env
key=
"PATH"
path=
"${PATH}"
/>
<env
key=
"PATH"
path=
"${PATH}"
/>
...
...
util-linux-2.34-fix_lsblk_pkname.patch
deleted
100644 → 0
View file @
4ba6c129
diff -uNr util-linux-2.34/misc-utils/lsblk.c util-linux-2.34-fix_lsblk_pkname/misc-utils/lsblk.c
--- util-linux-2.34/misc-utils/lsblk.c 2019-05-23 20:06:32.865212279 +0930
+++ util-linux-2.34-fix_lsblk_pkname/misc-utils/lsblk.c 2019-11-03 01:27:36.940050365 +1030
@@ -1019,6 +1019,9 @@
DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name));
ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name));
+ if (!parent && dev->wholedisk)
+ parent = dev->wholedisk;
+
/* Do not print device more than one in --list mode */
if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed)
return;
util-linux-2.35.2-no_C.UTF-8_locale.patch
0 → 100644
View file @
4f58d52e
diff -uNr util-linux-2.35.2/tests/ts/column/invalid-multibyte util-linux-2.35.2-no_C.UTF-8_locale/tests/ts/column/invalid-multibyte
--- util-linux-2.35.2/tests/ts/column/invalid-multibyte 2020-02-27 19:56:34.731140139 +1030
+++ util-linux-2.35.2-no_C.UTF-8_locale/tests/ts/column/invalid-multibyte 2020-07-12 11:16:52.743959580 +0930
@@ -25,6 +25,6 @@
ts_cd "$TS_OUTDIR"
-printf "\x94\x7e\n" | LC_ALL=C.UTF-8 $TS_CMD_COLUMN >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf "\x94\x7e\n" | LC_ALL=en_US.UTF-8 $TS_CMD_COLUMN >> $TS_OUTPUT 2>> $TS_ERRLOG
ts_finalize
util-linux-2.3
4
.tar.xz
→
util-linux-2.3
5.2
.tar.xz
View file @
4f58d52e
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment