Commit Graph

9919 Commits

Author SHA1 Message Date
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
Ian Stakenvicius
551346ef4d Restored persistent-net-generator rules as per issue 13 2012-12-06 16:04:58 -05:00
Matthew Thode
9d261224be Merge pull request #30 from gentoo/blueness
CONTRIBUTING: documentation on how to contribute
2012-12-04 15:54:00 -08:00
Anthony G. Basile
3b76e0c84c CONTRIBUTING: documentation on how to contribute
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-12-04 17:50:37 -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
blueness
6d5b7d8dee Merge pull request #27 from nvinson/master
Update Gudev make rules.
2012-12-01 16:35:37 -08:00
Nick Vinson
b6ec669a40 Add & Update include paths to gudev/Makefile.am
libgudev-1.0.la and gudev-1.0.gir fail to build because GCC cannot find the
needed header files (e.g. gudevenumtypes.h).  To fix this, the include path
$(top_buildir)/src was added and 'gdev' was replaced with 'gudev' in all
relevant include paths.
2012-12-01 15:57:43 -05:00
Anthony G. Basile
0de7e6af11 Include config.h in src/libudev/Makefile.am to provide needed #define's
This commit provides needed #define's that provide structures that
are found at configure time.  It also reverts commit

    91ce21b2d7

to avoid redefinitions of _GNU_SOURCE.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-12-01 15:23:06 -05:00
Ian Stakenvicius
6ea07b48a5 Put libudev.so under ${prefix} so tools in rootprefix don't link to it
This is a combination of commits:
    bc7e89950323f635196c3c8eeebbe77af4307967
    cde38f304f1cba616dfad4eb2608e8ec1a163f61

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-12-01 14:26:06 -05:00
Ian Stakenvicius
8744282fa4 Put symbol versioning back, ensured libudev.sym is distributed
This is a combination of commits
    67fd630e5fadeed8e0e96d396a9ebdc5f677fe98
    f3666f76d5bf08572e001d1cee37e142b1a1be8f

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-12-01 14:22:05 -05:00
Ian Stakenvicius
91ce21b2d7 Fix glibc-isms with #define _GNU_SOURCE
This is a combination of commits
    c9485bf12eafad22dbe316ccbf3a9506d4cace66
    abd4a3a3bf5851f07cac6665f35c8b92279c4a47

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-12-01 14:06:51 -05:00
Ian Stakenvicius
ff05ef7ab2 Moved files to libudev that once were in upstream libsystemd-shared 2012-12-01 13:49:20 -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
Nick Vinson
3d2fa99001 Replace unused DISTCLEAN_LOCAL_HOOKS and correct path in test/Makefile.am
The DISTCLEAN_LOCAL_HOOKS variable is not used by automake when generating
Makefiles.  This has been replaced with the clean-local target which does get
used.  The clean-local target is defined to be dependent on the
test-sys-distclean target as recommended in the automake manual.

The paths in test-sys-distclean have been corrected to ensure that test/sys is
deleted during 'make distcheck'.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-11-26 23:52:18 -05:00
Nick Vinson
29c8198c6f Add $(BUILT_SOURCES) to src/keymap/Makefile.am's CLEANFILES variable.
When run, 'make distcheck' verifies that no files remain in the build directory.
However, 'make distcheck' does not automatically delete $(BUILT_SOURCES) by
default which causes this check to fail.  Adding $(BUILT_SOURCS) to CLEANFILES
corrects this behavior.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-11-26 23:52:18 -05:00
Anthony G. Basile
73577f3bcb Allow autogen on systems without gtk-doc or introspection installed
On systems without gtk-doc installed, we were mocking up docs/gtk-doc.make
and m4/gtk-doc.m4 to avoid a failure in configure.  On systems without
introspection installed, we were doing nothing and allowing the failure
to occur.  Since autogen should only be run on the developer side this is
should be okay, but to be more friendly to other distros and users that
want to start from autogen, we now bundle

	docs/gtk-doc.make
	m4/gtk-doc.m4
	m4/introspection.m4

Care in the future should be taken by the developers to make sure these
files stay up to day.

This should take care of

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

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-11-26 18:40:20 -05:00
Ian Stakenvicius
908f00df4b adjusted libudev.pc.in to use the correct libdir (rootlibdir) 2012-11-26 13:00:55 -05:00
Ian Stakenvicius
08d5e1acb6 changed install path for libudev to 'rootlibdir' instead of 'libdir' 2012-11-26 12:47:25 -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
Anthony G. Basile
081d682b26 Remove undeeded macros from m4 directory
The acx_libwrap.m4 and attributes.m4 were used for checks related
to libwrap and compile attribute/flags, respectively.  Since these
have been removed from the build system, they are left over lint.

Files can be retrieved by

 git checkout ddfb9b07df -- <filename>

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-11-23 08:55:12 -05:00
Richard Yao
ddfb9b07df
Fix build failure with --enable-gudev
The directory containing libudev.h was absent from search paths provided
to the preprocessor.

Signed-off-by: Richard Yao <ryao@gentoo.org>
2012-11-23 02:49:48 -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
Richard Yao
9b996818cb Introduce execute_command
This is useful in situations where we do not have builtins avaiable.

Signed-off-by: Richard Yao <ryao@gentoo.org>
2012-11-22 22:53:32 -05:00
Richard Yao
8a72e9e927 Remove user-visible systemd references from man pages
Signed-off-by: Richard Yao <ryao@gentoo.org>
2012-11-22 22:53:21 -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
Ian Stakenvicius
d9d70c20a5 Fixed a syntax error 2012-11-21 15:55:58 -05:00
Egor Y. Egorov
20d68c2ae8 udev: allow helpers to be in /lib/udev
Signed-off-by: Richard Yao <ryao@gentoo.org>
2012-11-20 17:18:12 -05:00
Michał Górny
a59b727179 udev: add /lib/udev/rules.d to rules directories
This adds /lib if split-usr is enabled
to the directories where udev searches for rules.d.

This is needed if split-usr is enabled because some software still
installs rules in /lib/udev/rules.d.

Signed-off-by: Richard Yao <ryao@gentoo.org>
2012-11-20 17:18:07 -05:00
Felipe Contreras
f74b77335b Fix NULL pointer deference in udev_hwdb_get_properties_list_entry
It is possible for udev_hwdb_get_properties_list_entry to be invoked
during udevd initialization before hwdb has been initialized. We
workaround that for now by introducing a check to handle that.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Commit-message-by: Richard Yao <ryao@gentoo.org>
2012-11-20 17:18:01 -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
Anthony G. Basile
802d021d2e test/Makefile.am: fix tests for make distcheck
At several points in the forked code, top_srcdir and top_builddir
are mixed up.  It is not clear if this is an upstream bug or if this
is a result of the initial restructuring of the build system.  This
commit addresses this issue for tests triggered during make distcheck.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2012-11-19 19:09:48 -05:00
Luca Barbato
a21f6c078b doc: clarify the scope of the project 2012-11-19 18:19:50 +01: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