diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-04-30 09:22:52 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-04-30 09:22:52 +0200 |
| commit | 8ef37e61f2e2db01d32dd6ec9a89202e973dddc8 (patch) | |
| tree | d6a0a7cbb1c072c042904ccbb2413b672a3d7b96 /recipes | |
| parent | 7efc24bf60fcb40244c69853f21e11cdb23e57e9 (diff) | |
| parent | 0263ec2aaffbe8e14a6e6ee71c0e7dd17d1a3d2c (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/base-files/base-files/om-gta02/fstab | 5 | ||||
| -rw-r--r-- | recipes/base-files/base-files_3.0.14.bb | 2 | ||||
| -rw-r--r-- | recipes/nandlogical/nandlogical-static_1.0.0.bb | 4 | ||||
| -rw-r--r-- | recipes/nandlogical/nandlogical_1.0.0.bb | 8 |
4 files changed, 13 insertions, 6 deletions
diff --git a/recipes/base-files/base-files/om-gta02/fstab b/recipes/base-files/base-files/om-gta02/fstab index 61c7cdcafd..c83b2b1214 100644 --- a/recipes/base-files/base-files/om-gta02/fstab +++ b/recipes/base-files/base-files/om-gta02/fstab @@ -1,5 +1,10 @@ /dev/mtdblock6 / jffs2 rw,noatime 1 1 proc /proc proc defaults 0 0 +tmpfs /var/volatile tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +tmpfs /media/ram tmpfs defaults 0 0 # microSD slot /dev/mmcblk0p1 /media/card auto defaults,async 0 0 +# stock fstab - you probably want to override this with a machine specific one + diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb index 460fd6357f..0d012c77f2 100644 --- a/recipes/base-files/base-files_3.0.14.bb +++ b/recipes/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r85" +PR = "r86" LICENSE = "GPL" SRC_URI = " \ diff --git a/recipes/nandlogical/nandlogical-static_1.0.0.bb b/recipes/nandlogical/nandlogical-static_1.0.0.bb index e2eaf4e1f5..ceeba555c3 100644 --- a/recipes/nandlogical/nandlogical-static_1.0.0.bb +++ b/recipes/nandlogical/nandlogical-static_1.0.0.bb @@ -1,5 +1,7 @@ +PR = "r2" + require nandlogical_${PV}.bb do_compile () { - ${CC} -o nandlogical ${WORKDIR}/nandlogical.c -static + ${CC} nandlogical.c -o nandlogical ${CFLAGS} ${LDFLAGS} } diff --git a/recipes/nandlogical/nandlogical_1.0.0.bb b/recipes/nandlogical/nandlogical_1.0.0.bb index ba851bf513..d567b48a3c 100644 --- a/recipes/nandlogical/nandlogical_1.0.0.bb +++ b/recipes/nandlogical/nandlogical_1.0.0.bb @@ -2,17 +2,17 @@ DESCRIPTION = "Nandlogical for Sharp mtd1" LICENSE = "GPL" DEPENDS = "mtd-utils" COMPATIBLE_MACHINE = "(poodle|c7x0|akita|spitz|tosa)" -PR = "r1" +PR = "r2" SRC_URI = "file://nandlogical.c" -S = "${WORKDIR}/${P}" +S = "${WORKDIR}" do_compile () { - ${CC} -o nandlogical ${WORKDIR}/nandlogical.c + ${CC} nandlogical.c -o nandlogical ${CFLAGS} ${LDFLAGS} } do_install () { install -d ${D}${bindir}/ - install -m 0755 ${WORKDIR}/${P}/nandlogical ${D}${bindir}/ + install -m 0755 nandlogical ${D}${bindir}/ } |