diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-07-01 00:44:57 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-07-01 00:44:57 +0000 |
| commit | 3abb2b2ab999f428c9e8f1215cf393eea8589e9f (patch) | |
| tree | 9497333c4ee67255d53f715aedef7b0098574e41 /modutils | |
| parent | b86cd133209a4c9cbcba168444258f76b9dee966 (diff) | |
Merges.
2004/06/30 19:43:22-05:00 (none)!kergoth
Clean up SRC_URI and remove oe_machinstall usage per the recent FILESPATH change.
BKrev: 40e35e89nLvooGCio5W-357_SZU3iA
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/modutils-collateral.oe | 32 | ||||
| -rw-r--r-- | modutils/modutils_2.4.27.oe | 25 |
2 files changed, 12 insertions, 45 deletions
diff --git a/modutils/modutils-collateral.oe b/modutils/modutils-collateral.oe index 0d01ae2c2e..d73ad635cc 100644 --- a/modutils/modutils-collateral.oe +++ b/modutils/modutils-collateral.oe @@ -1,28 +1,12 @@ DESCRIPTION = "modutils configuration files" FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/files" -SRC_URI = "\ - 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" +SRC_URI = "file://modutils-notest.patch \ + file://configure.patch \ + file://program_prefix.patch \ + file://modules \ + file://modules.conf \ + file://modutils" INITSCRIPT_NAME = "modutils" INITSCRIPT_PARAMS = "start 20 S ." @@ -35,6 +19,6 @@ do_compile () { do_install () { install -d ${D}/${sysconfdir} ${D}/etc/init.d/ install -m 0755 ${WORKDIR}/modutils ${D}/etc/init.d/ - oe_machinstall -m 0644 ${WORKDIR}/modules ${D}/${sysconfdir}/modules - oe_machinstall -m 0644 ${WORKDIR}/modules.conf ${D}/${sysconfdir}/modules.conf + install -m 0644 ${WORKDIR}/modules ${D}/${sysconfdir}/modules + install -m 0644 ${WORKDIR}/modules.conf ${D}/${sysconfdir}/modules.conf } diff --git a/modutils/modutils_2.4.27.oe b/modutils/modutils_2.4.27.oe index ffb8ed596b..4b328d5913 100644 --- a/modutils/modutils_2.4.27.oe +++ b/modutils/modutils_2.4.27.oe @@ -9,25 +9,8 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${ 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://boxer/modules \ - file://boxer/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" + file://modules \ + file://modules.conf" inherit autotools @@ -39,8 +22,8 @@ export BUILDCC = "${BUILD_CC}" do_install () { oe_runmake 'DESTDIR=${D}' install install -d ${D}/${sysconfdir} - oe_machinstall -m 0644 ${WORKDIR}/modules ${D}/${sysconfdir}/modules - oe_machinstall -m 0644 ${WORKDIR}/modules.conf ${D}/${sysconfdir}/modules.conf + install -m 0644 ${WORKDIR}/modules ${D}/${sysconfdir}/modules + install -m 0644 ${WORKDIR}/modules.conf ${D}/${sysconfdir}/modules.conf } pkg_postinst_modutils () { |