diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-05-22 16:47:36 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-05-22 16:47:36 +0000 |
| commit | 2b8f679ffe5929b5a11eb71e514aa4997c36f13e (patch) | |
| tree | cab0f25aca03f6162bd268a401945fbfbb63bff9 /modutils | |
| parent | 5df179157f90b18f437c6978efb451f515e3d1c9 (diff) | |
Merges.
2004/05/22 12:46:48-04:00 local!kergoth
Bugfixes per the recent FILESDIR cleanup.
2004/05/22 01:03:38-04:00 local!kergoth
Run a perl script against the repo to kill off direct FILESDIR usage
in favor of relative file:// paths in SRC_URI, and WORKDIR references
in functions.
2004/05/21 23:07:58-04:00 local!kergoth
Switch file:// FILESDIR uris in SRC_URI to the new relative path format.
BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/modutils-collateral.oe | 42 | ||||
| -rw-r--r-- | modutils/modutils_2.4.27.oe | 27 |
2 files changed, 43 insertions, 26 deletions
diff --git a/modutils/modutils-collateral.oe b/modutils/modutils-collateral.oe index a33291c067..121dd62b83 100644 --- a/modutils/modutils-collateral.oe +++ b/modutils/modutils-collateral.oe @@ -3,27 +3,27 @@ DESCRIPTION = "modutils configuration files" FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/files" SRC_URI = "\ - file://${FILESDIR}/shepherd/modules \ - file://${FILESDIR}/shepherd/modules.conf \ - file://${FILESDIR}/h3600/modules \ - file://${FILESDIR}/h3600/modules.conf \ - file://${FILESDIR}/corgi/modules \ - file://${FILESDIR}/corgi/modules.conf \ - file://${FILESDIR}/husky/modules \ - file://${FILESDIR}/husky/modules.conf \ - file://${FILESDIR}/modutils-notest.patch \ - file://${FILESDIR}/modutils \ - file://${FILESDIR}/collie/modules \ - file://${FILESDIR}/collie/modules.conf \ - file://${FILESDIR}/configure.patch \ - file://${FILESDIR}/poodle/modules \ - file://${FILESDIR}/poodle/modules.conf \ - file://${FILESDIR}/ramses/modules \ - file://${FILESDIR}/ramses/modules-ramses \ - file://${FILESDIR}/ramses/modules.conf \ - file://${FILESDIR}/simpad/modules \ - file://${FILESDIR}/simpad/modules.conf \ - file://${FILESDIR}/program_prefix.patch" + file://shepherd/modules \ + file://shepherd/modules.conf \ + file://h3600/modules \ + file://h3600/modules.conf \ + file://corgi/modules \ + file://corgi/modules.conf \ + file://husky/modules \ + file://husky/modules.conf \ + file://modutils-notest.patch \ + file://modutils \ + file://collie/modules \ + file://collie/modules.conf \ + file://configure.patch \ + file://poodle/modules \ + file://poodle/modules.conf \ + file://ramses/modules \ + file://ramses/modules-ramses \ + file://ramses/modules.conf \ + file://simpad/modules \ + file://simpad/modules.conf \ + file://program_prefix.patch" INITSCRIPT_NAME = "modutils" INITSCRIPT_PARAMS = "start 20 S ." diff --git a/modutils/modutils_2.4.27.oe b/modutils/modutils_2.4.27.oe index 892898dc98..9c32595a87 100644 --- a/modutils/modutils_2.4.27.oe +++ b/modutils/modutils_2.4.27.oe @@ -5,9 +5,26 @@ maintainers." FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/files" SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \ - file://${FILESDIR}/modutils-notest.patch;patch=1 \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/program_prefix.patch;patch=1" + file://modutils-notest.patch;patch=1 \ + file://configure.patch;patch=1 \ + file://program_prefix.patch;patch=1 \ + file://collie/modules \ + file://collie/modules.conf \ + file://corgi/modules \ + file://corgi/modules.conf \ + file://h3600/modules \ + file://h3600/modules.conf \ + file://husky/modules \ + file://husky/modules.conf \ + file://poodle/modules \ + file://poodle/modules.conf \ + file://ramses/modules \ + file://ramses/modules.conf \ + file://shepherd/modules \ + file://shepherd/modules.conf \ + file://simpad/modules \ + file://simpad/modules.conf \ + file://modutils" inherit autotools @@ -19,8 +36,8 @@ export BUILDCC = "${BUILD_CC}" do_install () { oe_runmake 'DESTDIR=${D}' install install -d ${D}/${sysconfdir} - oe_machinstall -m 0644 ${FILESDIR}/modules ${D}/${sysconfdir}/modules - oe_machinstall -m 0644 ${FILESDIR}/modules.conf ${D}/${sysconfdir}/modules.conf + oe_machinstall -m 0644 ${WORKDIR}/modules ${D}/${sysconfdir}/modules + oe_machinstall -m 0644 ${WORKDIR}/modules.conf ${D}/${sysconfdir}/modules.conf } pkg_postinst_modutils () { |