File tree 10 files changed +69
-6
lines changed
10 files changed +69
-6
lines changed Original file line number Diff line number Diff line change 1
- d966a1c6d9be4183945e9d985a61970ea4f1045c
1
+ 9ff438b922e2b12b60b56540cb80ccde8dfd2697
Original file line number Diff line number Diff line change @@ -6,4 +6,8 @@ URL(util-linux) := https://git.kernel.org/pub/scm/utils/util-linux/util-linux.gi
6
6
REV(util-linux) := v$(VERSION)
7
7
DIR(util-linux) := src/lib/util-linux
8
8
9
- PATCHES := src/lib/libuuid/patches/*.patch
9
+ PATCH_OPT := -p1 -d src/lib/util-linux/
10
+ PATCHES := src/lib/libuuid/patches/*.patch
11
+
12
+ DIRS := include/libuuid
13
+ DIR_CONTENT(include/libuuid) := src/lib/util-linux/libuuid/src/*.h
Original file line number Diff line number Diff line change
1
+ MIRROR_FROM_REP_DIR = lib/import/import-libuuid.mk lib/symbols/libuuid
2
+
3
+ content : $(MIRROR_FROM_REP_DIR ) include LICENSE
4
+
5
+ $(MIRROR_FROM_REP_DIR ) :
6
+ $(mirror_from_rep_dir )
7
+
8
+ PORT_DIR := $(call port_dir,$(REP_DIR ) /ports/util-linux)
9
+
10
+ include :
11
+ mkdir -p $@
12
+ cp -r $(PORT_DIR ) /include/libuuid/* $@
13
+
14
+ LICENSE :
15
+ cp $(PORT_DIR ) /src/lib/util-linux/COPYING $@
Original file line number Diff line number Diff line change
1
+ 2022-11-21T0914 88b32b815a1398363b4b5929fe59b0f963e98b51
Original file line number Diff line number Diff line change
1
+ libuuid
Original file line number Diff line number Diff line change
1
+ MIRROR_FROM_REP_DIR = lib/import/import-libuuid.mk lib/mk/libuuid.mk
2
+
3
+ content : $(MIRROR_FROM_REP_DIR ) src/lib/util-linux/libuuid/ src/lib/util-linux/lib/ src/lib/util-linux/include/
4
+
5
+ $(MIRROR_FROM_REP_DIR ) :
6
+ $(mirror_from_rep_dir )
7
+
8
+ PORT_DIR := $(call port_dir,$(REP_DIR ) /ports/util-linux)
9
+
10
+ src/lib/util-linux/libuuid/ :
11
+ mkdir -p $@
12
+ cp -r $(PORT_DIR ) /src/lib/util-linux/libuuid/* $@
13
+ echo " LIBS := libuuid" > $@ /target.mk
14
+
15
+ src/lib/util-linux/lib/ :
16
+ mkdir -p $@
17
+ cp -r $(PORT_DIR ) /src/lib/util-linux/lib/* $@
18
+
19
+ src/lib/util-linux/include/ :
20
+ mkdir -p $@
21
+ cp -r $(PORT_DIR ) /src/lib/util-linux/include/* $@
Original file line number Diff line number Diff line change
1
+ 2022-11-21T0919 4dd6e1f7ea2e31e32a2a39034b3074010b37c865
Original file line number Diff line number Diff line change
1
+ base
2
+ libc
Original file line number Diff line number Diff line change
1
+ diff --git a/lib/randutils.c b/lib/randutils.c
2
+ index 2ffe9b4f0..c57b7abcb 100644
3
+ --- a/lib/randutils.c
4
+ +++ b/lib/randutils.c
5
+ @@ -82,9 +82,9 @@ int random_get_fd(void)
6
+ {
7
+ int i, fd;
8
+
9
+ - fd = open("/dev/urandom", O_RDONLY | O_CLOEXEC);
10
+ + fd = open("/dev/urandom", O_RDONLY);
11
+ if (fd == -1)
12
+ - fd = open("/dev/random", O_RDONLY | O_NONBLOCK | O_CLOEXEC);
13
+ + fd = open("/dev/random", O_RDONLY);
14
+ if (fd >= 0) {
15
+ i = fcntl(fd, F_GETFD);
16
+ if (i >= 0)
Original file line number Diff line number Diff line change 1
- --- src/lib/util-linux/include/c.h 2019-05-10 11:50:31.659841756 +0200
2
- +++ src/lib/util-linux/include/c.h 2019-05-10 11:22:31.466975561 +0200
3
- @@ -308,6 +308,7 @@
1
+ diff --git a/include/c.h b/include/c.h
2
+ index cbc99669f..32fbb1bc3 100644
3
+ --- a/include/c.h
4
+ +++ b/include/c.h
5
+ @@ -390,6 +390,7 @@ fail:
4
6
5
7
static inline int xusleep(useconds_t usec)
6
8
{
7
9
+ /*
8
10
#ifdef HAVE_NANOSLEEP
9
11
struct timespec waittime = {
10
12
.tv_sec = usec / 1000000L,
11
- @@ -315 ,10 +316 ,13 @@
13
+ @@ -397 ,10 +398 ,13 @@ static inline int xusleep(useconds_t usec)
12
14
};
13
15
return nanosleep(&waittime, NULL);
14
16
#elif defined(HAVE_USLEEP)
You can’t perform that action at this time.
0 commit comments