dracut: update to 043.
This commit is contained in:
parent
a41efc225e
commit
f2c04a1943
@ -1,49 +0,0 @@
|
|||||||
Portability fixes:
|
|
||||||
|
|
||||||
- Use uid_t not __uid_t.
|
|
||||||
- Define _GNU_SOURCE for cpu_set_t and others.
|
|
||||||
- Include string.h for strncmp().
|
|
||||||
- Detect musl's ldd error message.
|
|
||||||
|
|
||||||
--- install/util.h 2014-10-24 13:19:58.000000000 +0200
|
|
||||||
+++ install/util.h 2014-12-28 07:58:51.723864634 +0100
|
|
||||||
@@ -20,6 +20,8 @@
|
|
||||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
***/
|
|
||||||
|
|
||||||
+#define _GNU_SOURCE
|
|
||||||
+
|
|
||||||
#include <inttypes.h>
|
|
||||||
#include <time.h>
|
|
||||||
#include <sys/time.h>
|
|
||||||
@@ -27,6 +29,7 @@
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
+#include <string.h>
|
|
||||||
#include <signal.h>
|
|
||||||
#include <sched.h>
|
|
||||||
#include <limits.h>
|
|
||||||
--- install/dracut-install.c.orig 2014-10-24 13:19:58.000000000 +0200
|
|
||||||
+++ install/dracut-install.c 2014-12-30 10:16:25.850635694 +0100
|
|
||||||
@@ -222,7 +222,7 @@ static int cp(const char *src, const cha
|
|
||||||
if (ret == 0) {
|
|
||||||
struct timeval tv[2];
|
|
||||||
if (fchown(dest_desc, sb.st_uid, sb.st_gid) != 0)
|
|
||||||
- if(fchown(dest_desc, (__uid_t) - 1, sb.st_gid) != 0)
|
|
||||||
+ if(fchown(dest_desc, (uid_t) - 1, sb.st_gid) != 0)
|
|
||||||
log_error("Failed to chown %s: %m", dst);
|
|
||||||
tv[0].tv_sec = sb.st_atime;
|
|
||||||
tv[0].tv_usec = 0;
|
|
||||||
@@ -388,6 +388,11 @@ static int resolve_deps(const char *src)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /* musl ldd */
|
|
||||||
+ if (strstr(buf, "Not a valid dynamic program"))
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
+ /* glibc */
|
|
||||||
if (strstr(buf, "not a dynamic executable"))
|
|
||||||
break;
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
|||||||
# Template file for 'dracut'
|
# Template file for 'dracut'
|
||||||
pkgname=dracut
|
pkgname=dracut
|
||||||
version=041
|
version=043
|
||||||
revision=1
|
revision=1
|
||||||
build_style=meta
|
build_style=configure
|
||||||
|
configure_args="--prefix=/usr --sysconfdir=/etc"
|
||||||
hostmakedepends="libxslt docbook-xsl asciidoc"
|
hostmakedepends="libxslt docbook-xsl asciidoc"
|
||||||
depends="psmisc cpio"
|
depends="psmisc cpio"
|
||||||
conf_files="/etc/dracut.conf"
|
conf_files="/etc/dracut.conf"
|
||||||
@ -14,17 +15,9 @@ short_desc="A new initramfs infrastructure"
|
|||||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
license="GPL-2"
|
license="GPL-2"
|
||||||
distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz"
|
distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz"
|
||||||
checksum=8ece6c2240bf0e9283e5f717b65dfcd6830b3ef7f8d1c01b60014052f1063251
|
checksum=1484b558ed20330125aa04dcccab84da15c5689e19068285aa011f7177889cd1
|
||||||
|
|
||||||
do_build() {
|
|
||||||
export CFLAGS="$CFLAGS -Wformat"
|
|
||||||
make ${makejobs} sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system
|
|
||||||
}
|
|
||||||
do_install() {
|
|
||||||
# fix path to busybox.
|
|
||||||
sed -i "s|/sbin/busybox|/bin/busybox|g" modules.d/05busybox/module-setup.sh
|
|
||||||
make DESTDIR=${DESTDIR} sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system install
|
|
||||||
|
|
||||||
|
post_install() {
|
||||||
# kernel hooks.
|
# kernel hooks.
|
||||||
vinstall ${FILESDIR}/kernel-hook-postinst 755 etc/kernel.d/post-install 10-dracut
|
vinstall ${FILESDIR}/kernel-hook-postinst 755 etc/kernel.d/post-install 10-dracut
|
||||||
vinstall ${FILESDIR}/kernel-hook-postrm 755 etc/kernel.d/post-remove 10-dracut
|
vinstall ${FILESDIR}/kernel-hook-postrm 755 etc/kernel.d/post-remove 10-dracut
|
||||||
|
Loading…
x
Reference in New Issue
Block a user