]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
build-sys: remove duplicate includes
authorKarel Zak <kzak@redhat.com>
Tue, 10 Dec 2019 12:50:18 +0000 (13:50 +0100)
committerKarel Zak <kzak@redhat.com>
Tue, 10 Dec 2019 12:50:18 +0000 (13:50 +0100)
Signed-off-by: Karel Zak <kzak@redhat.com>
libfdisk/src/partition.c
term-utils/scriptlive.c
tests/ts/build-sys/config

index 60feb74a621323d129c410c14bdaf1b1e13ba398..9e87a6864682208d1ea8e2948fe25dd9bd8195f8 100644 (file)
@@ -7,7 +7,6 @@
 #endif
 
 #include "fdiskP.h"
 #endif
 
 #include "fdiskP.h"
-#include "strutils.h"
 
 /**
  * SECTION: partition
 
 /**
  * SECTION: partition
index 6d263296bf62a5f119baf7f447685a16715eb643..b17dc9ef304e0f8f7dc72a752fede00dd64feb29 100644 (file)
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <termios.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <termios.h>
-#include <unistd.h>
 #include <paths.h>
 
 #include "c.h"
 #include <paths.h>
 
 #include "c.h"
index bc48c509d07995eaaf4903700d54b9deee549461..113fbb93875ffc1c2a3ef33d7ba7222b2e3b638e 100755 (executable)
@@ -36,7 +36,7 @@ for conf in $config_gen_dir/config-gen.d/*.conf; do
        for b in $bins; do
                libs=$(readelf --dynamic $b 2> /dev/null   | \
                        awk '/NEEDED/ { print $5 }' | \
        for b in $bins; do
                libs=$(readelf --dynamic $b 2> /dev/null   | \
                        awk '/NEEDED/ { print $5 }' | \
-                       sed 's:\[::g; s:\..*::g; s:libc::g; s:ld\-.*::g' | \
+                       sed 's:\[::g; s:\..*::g; s:^libc$::g; s:ld\-.*::g' | \
                        sort -u | tr '\n' ' ')
 
                if [ -n "$libs" ]; then
                        sort -u | tr '\n' ' ')
 
                if [ -n "$libs" ]; then