From 654c46984262acc8a087310eeb426d2a71fc623e Mon Sep 17 00:00:00 2001 From: Jacek Konieczny Date: Fri, 19 Dec 2003 13:38:28 +0000 Subject: [PATCH] - use glibc definition of dev_t, not kernel one. Someone has to check if this doesn't break anything Changed files: util-linux-dev_t.patch -> 1.1 util-linux.spec -> 1.232 --- util-linux-dev_t.patch | 13 +++++++++++++ util-linux.spec | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 util-linux-dev_t.patch diff --git a/util-linux-dev_t.patch b/util-linux-dev_t.patch new file mode 100644 index 0000000..7fd130d --- /dev/null +++ b/util-linux-dev_t.patch @@ -0,0 +1,13 @@ +diff -durN -x '*~' util-linux-2.12.orig/mount/my_dev_t.h util-linux-2.12/mount/my_dev_t.h +--- util-linux-2.12.orig/mount/my_dev_t.h 2003-07-16 22:05:50.000000000 +0200 ++++ util-linux-2.12/mount/my_dev_t.h 2004-12-19 14:31:34.467427960 +0100 +@@ -3,5 +3,9 @@ + /* maybe we need __kernel_old_dev_t -- later */ + /* for ancient systems use "unsigned short" */ + ++#if 0 + #include + #define my_dev_t __kernel_dev_t ++#else ++#define my_dev_t dev_t ++#endif diff --git a/util-linux.spec b/util-linux.spec index ca5ccd4..259a2e8 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -44,6 +44,7 @@ Patch12: %{name}-ppc-hwclock.patch Patch13: %{name}-no_multiline.patch Patch14: %{name}-amd64.patch Patch15: %{name}-crypto-debian.patch +Patch16: %{name}-dev_t.patch BuildRequires: gettext-devel BuildRequires: grep %{!?_with_uClibc:BuildRequires: ncurses-devel >= 5.0} @@ -344,6 +345,7 @@ Obs %patch13 -p0 %patch14 -p1 %patch15 -p1 +%patch16 -p1 %build CC="%{__cc}" -- 2.44.0