File move-udevd-and-udevadm-back-to-sbin.patch of Package udev

Overview Repositories Revisions Requests Users Attributes Meta

File move-udevd-and-udevadm-back-to-sbin.patch of Package udev (Revision 5682d32cb7ae7180db964284bbd04bad)

Currently displaying revision 5682d32cb7ae7180db964284bbd04bad , Show latest

diff -ur udev-182.orig/Makefile.am udev-182/Makefile.am
--- udev-182.orig/Makefile.am	2012-04-04 10:41:31.288555169 +0200
+++ udev-182/Makefile.am	2012-04-04 10:43:15.001036099 +0200
@@ -198,11 +198,9 @@
 INSTALL_DATA_HOOKS += systemd-install-hook
 endif
 
-bin_PROGRAMS = \
-	udevadm
-
-pkglibexec_PROGRAMS = \
-	udevd
+sbin_PROGRAMS = \
+        udevd \
+        udevadm
 
 udev_common_sources = \
 	src/udev.h \
@@ -316,7 +314,7 @@
 # ------------------------------------------------------------------------------
 ata_id_SOURCES = src/ata_id/ata_id.c
 ata_id_LDADD = libudev-private.la
-pkglibexec_PROGRAMS += ata_id
+pkglibexec_PROGRAMS = ata_id
 
 # ------------------------------------------------------------------------------
 cdrom_id_SOURCES = src/cdrom_id/cdrom_id.c
diff -ur udev-182.orig/Makefile.in udev-182/Makefile.in
--- udev-182.orig/Makefile.in	2012-04-04 10:41:31.288555169 +0200
+++ udev-182/Makefile.in	2012-04-04 10:45:42.945720696 +0200
@@ -53,8 +53,11 @@
 @WITH_SYSTEMD_TRUE@	src/udev-settle.service
 
 @WITH_SYSTEMD_TRUE@am__append_4 = systemd-install-hook
-bin_PROGRAMS = udevadm$(EXEEXT)
-pkglibexec_PROGRAMS = udevd$(EXEEXT) ata_id$(EXEEXT) cdrom_id$(EXEEXT) \
+
+sbin_PROGRAMS = udevadm$(EXEEXT) \
+       udevd$(EXEEXT)
+
+pkglibexec_PROGRAMS = ata_id$(EXEEXT) cdrom_id$(EXEEXT) \
 	collect$(EXEEXT) scsi_id$(EXEEXT) v4l_id$(EXEEXT) \
 	accelerometer$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
 	$(am__EXEEXT_3)
@@ -241,7 +244,7 @@
 @ENABLE_KEYMAP_TRUE@am__EXEEXT_1 = keymap$(EXEEXT)
 @ENABLE_MTD_PROBE_TRUE@am__EXEEXT_2 = mtd_probe$(EXEEXT)
 @ENABLE_FLOPPY_TRUE@am__EXEEXT_3 = create_floppy_devices$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS) $(pkglibexec_PROGRAMS)
+PROGRAMS = $(sbin_PROGRAMS) $(pkglibexec_PROGRAMS)
 am_accelerometer_OBJECTS = src/accelerometer/accelerometer.$(OBJEXT)
 accelerometer_OBJECTS = $(am_accelerometer_OBJECTS)
 accelerometer_DEPENDENCIES = libudev-private.la
@@ -1195,10 +1198,10 @@
 	$(AM_V_CCLD)$(LINK)  $(libudev_private_la_OBJECTS) $(libudev_private_la_LIBADD) $(LIBS)
 libudev.la: $(libudev_la_OBJECTS) $(libudev_la_DEPENDENCIES) $(EXTRA_libudev_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libudev_la_LINK) -rpath $(libdir) $(libudev_la_OBJECTS) $(libudev_la_LIBADD) $(LIBS)
-install-binPROGRAMS: $(bin_PROGRAMS)
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	@list='$(sbin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p || test -f $$p1; \
@@ -1220,9 +1223,9 @@
 	    } \
 	; done
 
-uninstall-binPROGRAMS:
+uninstall-sbinPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	@list='$(sbin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
 	      -e 's/$$/$(EXEEXT)/' `; \
@@ -1230,8 +1233,8 @@
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+clean-sbinPROGRAMS:
+	@list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
 	echo " rm -f" $$list; \
 	rm -f $$list || exit $$?; \
 	test -n "$(EXEEXT)" || exit 0; \

Places

File move-udevd-and-udevadm-back-to-sbin.patch of Package udev (Revision 5682d32cb7ae7180db964284bbd04bad)

Places