Commit Graph

292 Commits

Author SHA1 Message Date
Ian Stakenvicius
dd43e0b64c Adjust version in configure.ac for beta2 release
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
 Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
2013-01-21 15:49:32 -05:00
Ian Stakenvicius
6d72c38a3f Forward-port of libudev.so.0 code from libudev-171
Add --enable-legacylib option to configure, allowing for build and
installation of libudev.so.0 shared library for supporting pre-udev-183
software.  Library is installed to rootlibdir.

Note that this legacy library will not be maintained, and should not be used
for anything other than supporting a working system until all software
on the system is migrated to use libudev.so.1

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-01-21 14:34:02 -05:00
Ian Stakenvicius
09f41d6de4 Bump UDEV_VERSION as libudev is 196 compliant
We haven't confirmed yet that everything is compliant with
196 but libudev is and it seems relevant that udevadm reports
the udev version that provides hwdb functions

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-01-08 14:24:04 -05:00
Ian Stakenvicius
8638965ac2 Fixed some comments relating to udevlibexecdir paths
Keymaps rules had stated to add or modify /usr/lib/udev/* files instead
of using generic paths, and there was no mention of /etc/udev/* being valid
even though it is (and is the better way to do system-specific
modifications)
2013-01-04 14:34:52 -05:00
Ian Stakenvicius
5ea3e4deff Adjust the install path of keymaps to $(libdir)/udev
Since these keymaps are the default reference files they should be
installed in the same location as the default rules files.  This
matches sys-fs/udev behaviour as well
2013-01-04 11:33:33 -05:00
Luca Barbato
8e92264b4e build: switch to C99
Remove some redundant checks while at it.
2012-12-27 23:23:23 +01:00
blueness
cc5c144a70 Merge pull request #32 from nvinson/distcheck_fix
Fix make distcheck error: "gtk-doc must be installed and enabled in order to make dist"

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-12-12 06:58:49 -08:00
Ian Stakenvicius
036bc1a950 Changed --enable-split-usr to add hard-coded paths for rules etc in both / and /usr
This is necessary because the code originally defined paths assuming UDEV_LIBEXECDIR
was /usr prefixed, and also that udevrulesdir was located in /etc.  Since (1) both of
these defaults have changed, and (2) they could be set to more or less anything, we
want to ensure that there is support for the standard paths as well, irrespective of
what UDEV_LIBEXECDIR and UDEV_RULES_DIR are set to.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-12-12 09:56:16 -05:00
Nick Vinson
db8d865e62 Move DISTCHECK_CONFIGURE_FLAGS var to Makefile.am
DISTCHECK_CONFIGURE_FLAGS is an automake variable and is not properly
detected when it is inside configure.ac
2012-12-08 11:46:18 -05:00
Richard Yao
7f14ef6bb1 eudev 1_beta1
Signed-off-by: Richard Yao <ryao@gentoo.org>
2012-12-08 09:56:49 -05:00
Richard Yao
bfc850a01b Add fallback path when accept4() is not available.
Commit ff2c503df0 introduced accept4() into
udev, which broke compatibility with kernels older than Linux 2.6.32 (or
Linux 2.6.36 on ARM). The purpose of accept4() is to permit
O_NONBLOCK and O_CLOEXEC to be specified at the accept() call site
while previously, they had to be set using fcntl() because Linux does
not inherit them.

Since accept4() increases the minimum kernel version, we add a fallback
path for situations in which it is unavailable.

Reported-by: Stephen Klimaszewski <steev@gentoo.org>
Signed-off-by: Richard Yao <ryao@gentoo.org>
2012-12-08 09:48:07 -05:00
Richard Yao
2718feb9ed Fix autotools module checks
Module loading support was unconditionally disabled in the initial
autotools tests. I had missed this in my testing because I still had the
80-drivers.rules file from udev 171 on my system, which masked this
issue by invoking modprobe explicitly. This patch corrects the issue.

Signed-off-by: Richard Yao <ryao@gentoo.org>
2012-12-02 19:45:55 -05:00
Richard Yao
bfbd4ee14e Use udev version instead of eudev version for compatibility
The use of the eudev version in pkgconfig files caused build failures,
so we switch to the udev version for compatibility purposes.

Resolves gentoo/eudev#22

Signed-off-by: Richard Yao <ryao@gentoo.org>
2012-12-02 16:55:22 -05:00
Ian Stakenvicius
1bbffd4f09 drop ACL support, udev-acl is in consolekit upstream 2012-12-01 13:48:00 -05:00
Ian Stakenvicius
7bfe5fc126 Put rules.d back into rootlibdir/udev , not sure why/how it moved... 2012-11-29 10:07:41 -05:00
Anthony G. Basile
4b3087eb7d Fix up building gudev and introspection under make distcheck
This commit makes sure that src/gudev/gudevprivate.h is included
in the distribution, fixing a failure in building gudev with
`make distcheck`.  There's also some code cleanup and migration
of all configurable paths to the main configure.ac file.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-11-25 19:44:28 -05:00
Anthony G. Basile
518c07d5b4 Fix compilation of gudev and introspection
This commit the related issues of building gudev with/out
introspection.  It draws on suggestions from nvinson in

 https://github.com/gentoo/eudev/pull/20

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-11-25 15:37:04 -05:00
Anthony G. Basile
e0551bfe66 Fixes the contents of udev.pc
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-11-25 07:49:21 -05:00
Anthony G. Basile
73e31d7ae7 Fix paths: test/udev-test.pl now works under sudo make distcheck
We move the test-udev.c and test-libudev.c from src/test to test.
This corrects the a problem with hard coded relative paths finding
the test/test/sys directory created by test/udev-test.pl.

This commit draws heavily from nvinson patch in

 https://github.com/gentoo/eudev/pull/20

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-11-24 23:47:06 -05:00
Anthony G. Basile
6cb86c3a33 Propagation of configured installation paths to Makefile.am and .c code
This commit is a continuation of the previous one in which all the configured
paths obtained in configure.ac are propagated to the Makefile.am and .c files
via AM_CPPFLAGS of the form -DUDEV_CONF_FILE=\"$(udevconffile)\". This should
address the issue in

  https://github.com/gentoo/eudev/issues/17

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-11-23 18:56:16 -05:00
Anthony G. Basile
e5cc2b881f Consolidate configuration of all installation paths into configure.ac
The configuration of the installation paths for various components
was scattered between the main configure.ac file and the various
Makefile.am's.  These components are: udev config file, hwdb, keymaps
and force-release keymaps and the rules.  This commit consolidates
them all into one point in configure.ac and anticipates the inclusion
of new AM_CPPFLAGS of the form -DHWDB_BIN=@udevhwdbdir@ as upstream
has done, so it is easier to address issues like:

  https://github.com/gentoo/eudev/issues/17

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-11-23 13:48:49 -05:00
Anthony G. Basile
ef6fd93e79 configure.ac: remove unecessary check for python
The original checks for python were to build some man pages and
for systemd-python.  These checks are no longer relevant.  There
still is a dependency on python for tests but this is checked by
test/rules-test.sh which tests for python or skips.  Also, there
is a dependency on perl for both tests and hwdb.  These checks can
be reintroduced at a future date when re revisit both.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-11-23 12:29:06 -05:00
Anthony G. Basile
71c86e677d configure.ac: clean up GTK_DOC_CHECK
The GTK_DOC_CHECK macro includes AC_ARG_ENABLE/AS_HELP_STRING etc
for --enable-gtk-doc and there is no need for a second check.

One caveat should be noted: GTK_DOC_CHECK must begin the line for
gtkdocize to recognize its presense in configure.ac.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-11-23 10:40:08 -05:00
Richard Yao
3bb4e05ce4 Permit users to disable module loading support
Inspired by e30431623a7d871da123cc37055ac49abf2c20ea from systemd.

Signed-off-by: Richard Yao <ryao@gentoo.org>
2012-11-23 01:55:28 -05:00
Richard Yao
c4d1ce9b75 Use libkmod only when requested
We support module loading through modprobe when libkmod is neither
available nor wanted.

Signed-off-by: Richard Yao <ryao@gentoo.org>
2012-11-23 01:55:28 -05:00
Richard Yao
135d61df6f Reintroduce blkid-kmod
This opens the door to using disabling the use of kmod from autotools.

Signed-off-by: Richard Yao <ryao@gentoo.org>
2012-11-23 01:55:23 -05:00
Anthony G. Basile
b396e02c43 Fix keymap test during make distcheck
The keys/keymap test preformed by src/keymap/check-keymaps.sh must
find both keys.txt and the keymap directory.  When building out of
the source tree, eg when doing `make distcheck`, these are located
at ${top_builddir}/src/keymap/keys.txt and ${top_srcdir}/keymap/,
respectively.  This patch fixes the build so that these are now
correctly found.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-11-22 21:51:53 -05:00
Anthony G. Basile
cb7d6ade41 configure.ac: change package name to eudev
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-11-22 19:22:28 -05:00
Ian Stakenvicius
76e47c384f Make udevlibexecdir be substituted out of configure and assigned ${rootlibdir}/udev instead of ${root}/lib/udev 2012-11-22 09:45:09 -05:00
Anthony G. Basile
bcc69ef934 Reintroduce keymaps build and test
This commit reintroduces code to

 1) build src/keymap
 2) test keymap/Makefile.am that it has all the key maps listed
 3) test that all the key names in keymap/* are in <linux/input.h>
 4) do a syntax check on rules/*.rules which now includes
    95-keymap.rules and 95-keyboard-force-release.rules

For #4, the regex expressions in rule-syntax-check.py had to be
updated.  They do not allow trailing comments via # comment, and
I did not include that.  A rule in 95-keymap.rules had to have its
comment moved from the end to another line.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-11-20 14:44:47 -05:00
Richard Yao
31040610c9 Reintroduce blkid-builtin
The build failure that prompted its removal has been resolved.

Signed-off-by: Richard Yao <ryao@gentoo.org>
2012-11-19 11:09:29 -05:00
klondike
e0b2bb0a47 Check for unshare on the configure and provide an inline replacement when not available 2012-11-19 03:43:35 +01:00
Anthony G. Basile
814a724368 Got helper in src/* and make distcheck working 2012-11-18 07:08:19 -05:00
Anthony G. Basile
7730dfb5e1 Restructure src/ as per lu_zero 2012-11-17 16:22:12 -05:00
Anthony G. Basile
5c40c23567 Fix all Makefile.am: work towards 'make distcheck' sanity 2012-11-17 11:44:13 -05:00
Anthony G. Basile
67cae77034 Rename src/shared to src/include, a saner name 2012-11-17 10:13:59 -05:00
Anthony G. Basile
98520888b8 src/test: disable for now to get a full build 2012-11-17 01:33:48 -05:00
Richard Yao
151d9085b4 Eliminate blkid-builtin
Changes to rules were introduced by
7c2dee4a4d while builtin-blkid support was
introduced in other commits. The removal of systemd resulted in this
code causing linker errors. This code adds complexity with no clear
benefit, so we remove it.

Signed-off-by: Richard Yao <ryao@gentoo.org>
2012-11-17 01:07:22 -05:00
Richard Yao
a91a7609b2 Eliminate kmod dependency
Changes to rules were introduced by
06316d9f1a while kmod support was
introduced in other commits. A ton of commits were made involving kmod
and it is quite clear that it is broken, so we remove it.

This changes our rules to depend on modprobe. As long as the modprobe
binary is in /, and not /usr, udev module loading should function
properly.

Signed-off-by: Richard Yao <ryao@gentoo.org>
2012-11-17 01:07:22 -05:00
Anthony G. Basile
8b9605d16a src/udev: continue restoring needed deps 2012-11-17 00:12:08 -05:00
Anthony G. Basile
9ac9a4d1b7 src/udev/Makefile.am: work towards fixing up udev build 2012-11-16 20:40:11 -05:00
Anthony G. Basile
aa8f9e6be0 configure.ac: fix gtk-doc 2012-11-16 19:42:09 -05:00
Anthony G. Basile
a2b01dbfa5 src/libudev: successfully builds 2012-11-15 23:11:59 -05:00
Anthony G. Basile
eb203b01c9 Final step of revamping the build system
The structure of the source tree is basically correct and this is
about as far as we can go without hacking at the C code.
2012-11-15 21:47:20 -05:00
Anthony G. Basile
c47f33a498 Second step of revamping the build system
The original Makefile.am was drawn to the top level.  This commit
breaks it out into the various directories with SUBDIRS connecting
them.  This makes each directory easier to maintain.
2012-11-15 20:18:22 -05:00
Anthony G. Basile
b7b2cc298c Initial revamping of the build system
This is the first pass attempting to keep as much of the build system
as is necessary for only udev from the fork.  Emphasis was given to
configure.ac.  Gutting had to be done to Makefile.am but this needs
work to be broken out into SUBDIR Makefile.am which each address those
pieces.
2012-11-15 14:51:20 -05:00
Michal Schmidt
e17187091d configure.ac: fix FTBFS with new glibc
glibc moved clock_* functions from librt to the core libc. As a result,
clock_gettime is no more a suitable symbol to use when finding librt.
Look for mq_open instead.
Reference:
http://www.sourceware.org/git/gitweb.cgi?p=glibc.git&h=6e6249d0b461b952d0f544792372663feb6d792a

Fixes a FTBFS in Fedora Rawhide.
2012-11-14 14:46:15 +01:00
Zbigniew Jędrzejewski-Szmek
568c7e0237 systemd-python: use python${PYTHON_VERSION}-config as python-config
This is the usual setup, where pythonX.Y and pythonX.Y-config go
together. Using python-config with python3 will only lead to
confusion.

--libs is changed to --ldflags, since the latter also includes other
required flags like -L<dir>.

The tests for HAVE_PYTHON and HAVE_PYTHON_DEVEL are separated. It is
possible to have python development libraries installed without the
binary (or to want to build python modules without using python during
the build).

A line is added to the output, to show what flags will be used for
python.
2012-11-13 02:32:56 +01:00
Kay Sievers
796b06c21b udev: add hardware database support 2012-10-23 16:43:32 +02:00
Zbigniew Jędrzejewski-Szmek
59bb9d9a14 build-sys: add check for microhttpd version 2012-10-23 15:35:34 +02:00