diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-05-22 21:22:15 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-05-22 21:22:15 +0000 |
| commit | 920f7ff74ac8482916f6ea6ac6e85fcd572cd240 (patch) | |
| tree | 77d634b322839ae30b00038710132236b9411377 | |
| parent | b93b3c20932a2910c9335e9b298833c4c14e3139 (diff) | |
Merge openembedded@openembedded.bkbits.net:packages
into hyperion.(none):/home/kergoth/code/projects/packages
2004/05/22 16:22:08-05:00 (none)!kergoth
Few more fixes from teh latest filesdir/workdir changes.
BKrev: 40afc487IJsDawUMj3rylp5CkQMTxw
| -rw-r--r-- | base-files/base-files_3.0.14.oe | 4 | ||||
| -rw-r--r-- | initscripts/initscripts_1.0.oe | 20 | ||||
| -rw-r--r-- | makedevs/makedevs-native_1.0.0.oe | 10 | ||||
| -rw-r--r-- | makedevs/makedevs_1.0.0.oe | 5 |
4 files changed, 4 insertions, 35 deletions
diff --git a/base-files/base-files_3.0.14.oe b/base-files/base-files_3.0.14.oe index 1f25ba676b..6bbd9c17cd 100644 --- a/base-files/base-files_3.0.14.oe +++ b/base-files/base-files_3.0.14.oe @@ -57,9 +57,7 @@ SRC_URI = " \ file://licenses/GPL-2 \ file://licenses/LGPL-2 \ file://licenses/LGPL-2.1 \ - file://licenses/Artistic \ - file://etc/issue-${DISTRO} \ - file://etc/issue.net-${DISTRO}" + file://licenses/Artistic" S = "${WORKDIR}" docdir_append = "/${P}" diff --git a/initscripts/initscripts_1.0.oe b/initscripts/initscripts_1.0.oe index a81cace93b..53b4576a17 100644 --- a/initscripts/initscripts_1.0.oe +++ b/initscripts/initscripts_1.0.oe @@ -33,27 +33,7 @@ SRC_URI = "file://halt \ file://extractfs \ file://checkroot.sh \ file://umountnfs.sh \ - file://device_table.txt \ - file://bootmisc.sh \ - file://checkroot.sh \ - file://finish \ - file://halt \ - file://hostname.sh \ - file://mountall.sh \ - file://mountnfs.sh \ - file://packages \ - file://reboot \ - file://rmnologin \ - file://sendsigs \ - file://single \ - file://umountnfs.sh \ - file://devpts.sh \ - file://devpts \ file://sysfs.sh \ - file://banner \ - file://devices \ - file://extractfs \ - file://umountfs \ file://device_table.txt" diff --git a/makedevs/makedevs-native_1.0.0.oe b/makedevs/makedevs-native_1.0.0.oe index 52c560fad7..2bf659f3ac 100644 --- a/makedevs/makedevs-native_1.0.0.oe +++ b/makedevs/makedevs-native_1.0.0.oe @@ -1,15 +1,7 @@ +include makedevs_${PV}.oe inherit native FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/makedevs-${PV}" -S = "${WORKDIR}/makedevs-native-${PV}" - -do_configure() { - cp -f ${WORKDIR}/makedevs.c ${S}/ -} - -do_compile() { - ${CC} ${CFLAGS} -o ${S}/makedevs ${S}/makedevs.c -} do_stage() { install -d ${STAGING_BINDIR}/ diff --git a/makedevs/makedevs_1.0.0.oe b/makedevs/makedevs_1.0.0.oe index d81519f63a..a2ed001f82 100644 --- a/makedevs/makedevs_1.0.0.oe +++ b/makedevs/makedevs_1.0.0.oe @@ -1,9 +1,8 @@ -SRC_URI = "file://makedevs.c \ - file://makedevs.c" +SRC_URI = "file://makedevs.c" S = "${WORKDIR}/makedevs-${PV}" do_configure() { - cp -f ${WORKDIR}/makedevs.c ${S}/ + install -m 0644 ${WORKDIR}/makedevs.c ${S}/ } do_compile() { |