klibc-udev: make this work on the initramfs.
--HG-- extra : convert_revision : 591f7c765141990665b9ee57e02d931bfa7b2a60
This commit is contained in:
Juan RP
parent
b7b8235665
commit
514be496a4
3 changed files with 60 additions and 28 deletions
|
|
@ -30,17 +30,49 @@
|
|||
return 0;
|
||||
}
|
||||
|
||||
--- Makefile.in.orig 2009-03-08 01:04:54.032608782 +0100
|
||||
+++ Makefile.in 2009-03-08 01:05:10.728461250 +0100
|
||||
@@ -212,10 +212,7 @@ AM_CFLAGS =
|
||||
AM_LDFLAGS = \
|
||||
-Wl,--as-needed
|
||||
--- extras/Makefile.in 2008-09-11 16:58:01.000000000 +0200
|
||||
+++ extras/Makefile.in 2008-09-18 12:03:09.000000000 +0200
|
||||
@@ -176,15 +176,11 @@
|
||||
udev_prefix = @udev_prefix@
|
||||
SUBDIRS = \
|
||||
ata_id \
|
||||
- cdrom_id \
|
||||
edd_id \
|
||||
path_id \
|
||||
firmware \
|
||||
- collect \
|
||||
floppy \
|
||||
- fstab_import \
|
||||
rule_generator \
|
||||
- scsi_id \
|
||||
usb_id \
|
||||
volume_id
|
||||
|
||||
-SUBDIRS = \
|
||||
- udev \
|
||||
- rules \
|
||||
- extras
|
||||
+SUBDIRS = udev
|
||||
--- extras/volume_id/lib/libvolume_id-private.h 2008-09-10 02:37:09.000000000 +0200
|
||||
+++ extras/volume_id/lib/libvolume_id-private.h 2008-09-18 12:07:57.000000000 +0200
|
||||
@@ -35,12 +35,8 @@
|
||||
log_null(const char *format, ...) {}
|
||||
|
||||
#define err(format, arg...) volume_id_log_fn(LOG_ERR, __FILE__, __LINE__, format, ##arg)
|
||||
-#define info(format, arg...) volume_id_log_fn(LOG_INFO, __FILE__, __LINE__, format, ##arg)
|
||||
-#ifdef DEBUG
|
||||
-#define dbg(format, arg...) volume_id_log_fn(LOG_DEBUG, __FILE__, __LINE__, format, ##arg)
|
||||
-#else
|
||||
+#define info(format, arg...) log_null(format, ##arg)
|
||||
#define dbg(format, arg...) log_null(format, ##arg)
|
||||
-#endif
|
||||
|
||||
#if (__BYTE_ORDER == __LITTLE_ENDIAN)
|
||||
#define le16_to_cpu(x) (x)
|
||||
--- extras/volume_id/lib/md5.c 2008-09-10 02:18:59.000000000 +0200
|
||||
+++ extras/volume_id/lib/md5.c 2008-09-18 12:03:09.000000000 +0200
|
||||
@@ -21,7 +21,7 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
-#include <stdint.h>
|
||||
+/*#include <stdint.h>*/
|
||||
#include <string.h>
|
||||
#include <endian.h>
|
||||
#include <byteswap.h>
|
||||
|
||||
udevconfdir = $(sysconfdir)/udev
|
||||
udevconf_DATA = \
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@ copy_exec /usr/bin/pkill /sbin
|
|||
copy_exec /bin/rm /bin
|
||||
|
||||
# Copy across the udev binaries
|
||||
copy_exec /usr/lib/klibc/bin/udevd /sbin
|
||||
copy_exec /usr/lib/klibc/bin/udevadm /sbin
|
||||
copy_exec /usr/lib/klibc/udev/udevd /sbin
|
||||
copy_exec /usr/lib/klibc/udev/udevadm /sbin
|
||||
|
||||
# Copy udev configuration
|
||||
mkdir -p ${DESTDIR}/etc/udev
|
||||
|
|
@ -43,8 +43,8 @@ done
|
|||
mkdir -p ${DESTDIR}/lib/udev
|
||||
# 50-udev-default.rules
|
||||
# 60-persistent-storage.rules
|
||||
copy_exec /lib/udev/ata_id /lib/udev
|
||||
copy_exec /lib/udev/usb_id /lib/udev
|
||||
copy_exec /lib/udev/vol_id /lib/udev
|
||||
copy_exec /lib/udev/scsi_id /lib/udev
|
||||
copy_exec /lib/udev/path_id /lib/udev
|
||||
#copy_exec /lib/udev/ata_id /lib/udev
|
||||
#copy_exec /lib/udev/usb_id /lib/udev
|
||||
copy_exec /usr/lib/klibc/udev/vol_id /lib/udev
|
||||
#copy_exec /lib/udev/scsi_id /lib/udev
|
||||
copy_exec /usr/lib/klibc/udev/path_id /lib/udev
|
||||
|
|
|
|||
|
|
@ -1,22 +1,20 @@
|
|||
# Template file for 'klibc-udev'
|
||||
pkgname=klibc-udev
|
||||
version=138
|
||||
version=139
|
||||
wrksrc="udev-${version}"
|
||||
distfiles="
|
||||
http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$version.tar.bz2"
|
||||
build_style=custom-install
|
||||
configure_args="--prefix="
|
||||
configure_env="CC=klcc LD=klcc"
|
||||
short_desc="A Userspace implementation of devfs (for initramfs)"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
checksum=bc525a4d6bdbace1b23433256643cc331e4049e1e2442333707e6d2ba8a173b4
|
||||
checksum=6786a896146b12323d0ef31601dc23b6e5501762d7d61c475d09e405494c21df
|
||||
long_desc="
|
||||
udev is a implementation of devfs in userspace using sysfs and
|
||||
/sbin/hotplug. It requires a 2.5/2.6 kernel to run properly.
|
||||
|
||||
This package has been built with klibc for use on the initramfs."
|
||||
|
||||
Add_dependency build klibc-devel
|
||||
Add_dependency build klibc
|
||||
Add_dependency run klibc
|
||||
|
||||
do_install()
|
||||
|
|
@ -27,9 +25,11 @@ do_install()
|
|||
CC=klcc LD=klcc CFLAGS="-O2" ./configure --prefix=
|
||||
make || exit 1
|
||||
|
||||
install -d ${destdir}/usr/lib/klibc/bin
|
||||
install -s -m755 udev/udevd ${destdir}/usr/lib/klibc/bin
|
||||
install -s -m755 udev/udevadm ${destdir}/usr/lib/klibc/bin
|
||||
install -d ${destdir}/usr/lib/klibc/udev
|
||||
install -s -m755 udev/udevd ${destdir}/usr/lib/klibc/udev
|
||||
install -s -m755 udev/udevadm ${destdir}/usr/lib/klibc/udev
|
||||
install -m755 extras/path_id/path_id ${destdir}/usr/lib/klibc/udev
|
||||
install -s -m755 extras/volume_id/vol_id ${destdir}/usr/lib/klibc/udev
|
||||
|
||||
# Install the initramfs-tools hook.
|
||||
install -d $destdir/usr/share/initramfs-tools/hooks
|
||||
|
|
|
|||
Loading…
Reference in a new issue