summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Woestenberg <leon.woestenberg@gmail.com>2007-05-17 20:59:38 +0000
committerLeon Woestenberg <leon.woestenberg@gmail.com>2007-05-17 20:59:38 +0000
commit7a94b10d320ce33834f6a8cefca505db39cc203d (patch)
tree326a78a014ab11806f5e2b0060706e755412c1b6
parent5f3423313cc1e068a3a2e142cb9c917b35d45f0d (diff)
parentdd8734fb36d95b8faca5db0a9967f7828fc75433 (diff)
merge of '90a3055e641e550e32a77ad0505f7b4d70410e2d'
and 'd972024e53622ab89c1b05ac1375a2f666f336ad'
-rw-r--r--packages/helloworld/.mtn2git_empty0
-rw-r--r--packages/helloworld/helloworld_1.0.0.bb25
-rw-r--r--packages/images/helloworld-image.bb14
-rw-r--r--packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro4
4 files changed, 2 insertions, 41 deletions
diff --git a/packages/helloworld/.mtn2git_empty b/packages/helloworld/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/helloworld/.mtn2git_empty
+++ /dev/null
diff --git a/packages/helloworld/helloworld_1.0.0.bb b/packages/helloworld/helloworld_1.0.0.bb
deleted file mode 100644
index 9e68b0bd61..0000000000
--- a/packages/helloworld/helloworld_1.0.0.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "Minimal statically compiled Hello world!"
-LICENSE = "GPL"
-PR = "r0"
-
-S = "${WORKDIR}/${P}"
-
-do_fetch () {
- mkdir -p ${WORKDIR}/${P}
- cd ${WORKDIR}/${P}
- echo -e "#include <stdio.h>\nint main(void)\n{\n\tprintf(\"Hello world!\\\n\");\twhile(1);\n\treturn 0;\n}\n" >helloworld.c
-}
-
-do_compile () {
- ${CC} -o helloworld helloworld.c -static
-}
-
-do_install () {
- install -d ${D}${bindir}
- install -m 0755 helloworld ${D}${bindir}/
- # /bin/init is on purpose, it is tried after /sbin/init and /etc/init
- # so if a sysvinit is installed, it will be used instead of helloworld
- install -d ${D}${base_bindir}
- ln -sf ${bindir}/helloworld ${D}${base_bindir}/init
-}
-
diff --git a/packages/images/helloworld-image.bb b/packages/images/helloworld-image.bb
deleted file mode 100644
index 5154752f75..0000000000
--- a/packages/images/helloworld-image.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-# Hello world image
-# Contains *only* a statically linked hello world init program
-LICENSE = "MIT"
-PR = "r0"
-
-RDEPENDS = "helloworld"
-
-export IMAGE_BASENAME = "helloworld-image"
-export IMAGE_LINGUAS = ""
-
-PACKAGE_INSTALL = ${RDEPENDS}
-
-inherit image
-
diff --git a/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro b/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro
index b326ff03b5..335e6c2bf5 100644
--- a/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro
+++ b/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro
@@ -25,8 +25,8 @@ MALLOC_STANDARD=y
MALLOC_GLIBC_COMPAT=y
UCLIBC_DYNAMIC_ATEXIT=y
COMPAT_ATEXIT=y
-UCLIBC_SUSV3_LEGACY=y
-UCLIBC_SUSV3_LEGACY_MACROS=y
+# UCLIBC_SUSV3_LEGACY is not set
+# UCLIBC_SUSV3_LEGACY_MACROS is not set
UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
UCLIBC_HAS___PROGNAME=y