Annotation of /trunk/dracut/patches/dracut-019-alx-no-pkgconfig.patch
Parent Directory
| 
Revision Log
Revision 1861 -
(hide annotations)
(download)
Thu Jul 26 15:13:44 2012 UTC (11 years, 11 months ago) by niro
File size: 2341 byte(s)
Thu Jul 26 15:13:44 2012 UTC (11 years, 11 months ago) by niro
File size: 2341 byte(s)
-added patches for busybox and alx
| 1 | niro | 1861 | diff -Naur dracut-019/dracut-functions.sh dracut-019-magellan/dracut-functions.sh |
| 2 | --- dracut-019/dracut-functions.sh 2012-07-26 19:06:17.178983597 +0200 | ||
| 3 | +++ dracut-019-magellan/dracut-functions.sh 2012-07-26 19:07:05.690982764 +0200 | ||
| 4 | @@ -531,7 +531,7 @@ | ||
| 5 | ln -sfn $(convert_abs_rel "${_target}" "${_realsrc}") "$initdir/$_target" | ||
| 6 | } | ||
| 7 | |||
| 8 | -udevdir=$(pkg-config udev --variable=udevdir) | ||
| 9 | +udevdir=/usr/lib/udev | ||
| 10 | if ! [[ -d "$udevdir" ]]; then | ||
| 11 | [[ -d /lib/udev ]] && udevdir=/lib/udev | ||
| 12 | [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev | ||
| 13 | diff -Naur dracut-019/modules.d/95udev-rules/module-setup.sh dracut-019-magellan/modules.d/95udev-rules/module-setup.sh | ||
| 14 | --- dracut-019/modules.d/95udev-rules/module-setup.sh 2012-06-04 14:24:25.000000000 +0200 | ||
| 15 | +++ dracut-019-magellan/modules.d/95udev-rules/module-setup.sh 2012-07-26 19:07:53.754983005 +0200 | ||
| 16 | @@ -5,13 +5,13 @@ | ||
| 17 | install() { | ||
| 18 | local _i | ||
| 19 | |||
| 20 | - systemdutildir=$(pkg-config systemd --variable=systemdutildir) | ||
| 21 | + systemdutildir=/usr/lib/systemd | ||
| 22 | if ! [[ -d "$systemdutildir" ]]; then | ||
| 23 | [[ -d /lib/systemd ]] && systemdutildir=/lib/systemd | ||
| 24 | [[ -d /usr/lib/systemd ]] && systemdutildir=/usr/lib/systemd | ||
| 25 | fi | ||
| 26 | |||
| 27 | - udevdir=$(pkg-config udev --variable=udevdir) | ||
| 28 | + udevdir=/usr/lib/udev | ||
| 29 | if ! [[ -d "$udevdir" ]]; then | ||
| 30 | [[ -d /lib/udev ]] && udevdir=/lib/udev | ||
| 31 | [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev | ||
| 32 | diff -Naur dracut-019/modules.d/98systemd/module-setup.sh dracut-019-magellan/modules.d/98systemd/module-setup.sh | ||
| 33 | --- dracut-019/modules.d/98systemd/module-setup.sh 2012-06-04 14:24:25.000000000 +0200 | ||
| 34 | +++ dracut-019-magellan/modules.d/98systemd/module-setup.sh 2012-07-26 19:09:23.375982644 +0200 | ||
| 35 | @@ -7,7 +7,6 @@ | ||
| 36 | if [[ -x /lib/systemd/systemd ]] || [[ -x /usr/lib/systemd/systemd ]]; then | ||
| 37 | return 255 | ||
| 38 | fi | ||
| 39 | - pkg-config systemd --variable=systemdutildir >/dev/null && return 255 | ||
| 40 | return 1 | ||
| 41 | } | ||
| 42 | |||
| 43 | @@ -18,8 +17,8 @@ | ||
| 44 | install() { | ||
| 45 | local systemdutildir systemdsystemunitdir | ||
| 46 | |||
| 47 | - systemdutildir=$(pkg-config systemd --variable=systemdutildir) | ||
| 48 | - systemdsystemunitdir=$(pkg-config systemd --variable=systemdsystemunitdir) | ||
| 49 | + systemdutildir=/usr/lib/systemd | ||
| 50 | + systemdsystemunitdir=/usr/lib/systemd/system | ||
| 51 | |||
| 52 | if ! [[ -d "$systemdutildir" ]]; then | ||
| 53 | [[ -d /lib/systemd ]] && systemdutildir=/lib/systemd |