From dbe4a736e3a731d18099ba6687a6e91edf280d00 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Mon, 9 Oct 2006 20:28:12 +0200 Subject: Sort out module-init-tools vs. modutils depmod situation. Signed-off-by: Rene Wagner --- .../packages/module-init-tools/files/cross.patch | 15 +++++++++++++++ .../module-init-tools/module-init-tools-cross_3.2.2.bb | 6 +++++- .../packages/modutils/modutils-cross_2.4.27.bb | 4 +++- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 org.handhelds.familiar/packages/module-init-tools/files/cross.patch diff --git a/org.handhelds.familiar/packages/module-init-tools/files/cross.patch b/org.handhelds.familiar/packages/module-init-tools/files/cross.patch new file mode 100644 index 0000000..a5c2ded --- /dev/null +++ b/org.handhelds.familiar/packages/module-init-tools/files/cross.patch @@ -0,0 +1,15 @@ +--- module-init-tools-3.2.2/depmod.c 2006-10-09 20:07:43.000000000 +0200 ++++ module-init-tools-3.2.2/depmod.c 2006-10-09 20:00:49.000000000 +0200 +@@ -216,11 +216,7 @@ + char pathname[strlen(argv[0])+1]; + char oldname[strlen("depmod") + strlen(argv[0]) + sizeof(".24")]; + +- memset(pathname, 0, strlen(argv[0])+1); +- sep = strrchr(argv[0], '/'); +- if (sep) +- memcpy(pathname, argv[0], sep - argv[0]+1); +- sprintf(oldname, "%s%s.24", pathname, "depmod"); ++ sprintf(oldname, "%s.24", argv[0]); + + /* Recursion detection: we need an env var since we can't + change argv[0] (as older modutils uses it to determine diff --git a/org.handhelds.familiar/packages/module-init-tools/module-init-tools-cross_3.2.2.bb b/org.handhelds.familiar/packages/module-init-tools/module-init-tools-cross_3.2.2.bb index 4bcc311..8e8386d 100644 --- a/org.handhelds.familiar/packages/module-init-tools/module-init-tools-cross_3.2.2.bb +++ b/org.handhelds.familiar/packages/module-init-tools/module-init-tools-cross_3.2.2.bb @@ -1,9 +1,13 @@ -LICENSE = "GPL" include module-init-tools_${PV}.bb +PR = "r2" + inherit cross DEFAULT_PREFERENCE = "0" PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" +DEPENDS += "virtual/${TARGET_PREFIX}depmod-2.4" +SRC_URI += "file://cross.patch;patch=1" + EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" do_stage () { diff --git a/org.handhelds.familiar/packages/modutils/modutils-cross_2.4.27.bb b/org.handhelds.familiar/packages/modutils/modutils-cross_2.4.27.bb index 2b301d7..8c2c08c 100644 --- a/org.handhelds.familiar/packages/modutils/modutils-cross_2.4.27.bb +++ b/org.handhelds.familiar/packages/modutils/modutils-cross_2.4.27.bb @@ -1,6 +1,7 @@ SECTION = "base" include modutils_${PV}.bb -PR = "r6" +PR = "r7" + inherit cross S = "${WORKDIR}/modutils-${PV}" DEPENDS = "" @@ -19,6 +20,7 @@ CFLAGS_prepend_mipseb = "-D__MIPSEB__" do_stage () { oe_runmake install + install -m 0755 ${bindir}/${TARGET_PREFIX}depmod ${bindir}/${TARGET_PREFIX}depmod.24 } do_install () { -- cgit v1.2.3-18-g5258