merge of '1eb1e872a6abb77435533ba52aa27b94003eb434'

     and 'c8599288dc49a072fdecb653b73e7451328d26de'

3 files changed, 6 insertions, 26 deletions

diff --git a/packages/busybox/busybox-static-1.2.1/.mtn2git_empty b/packages/busybox/busybox-static-1.2.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/busybox-static-1.2.1/.mtn2git_empty
diff --git a/packages/busybox/busybox-static_1.2.1.bb b/packages/busybox/busybox-static_1.2.1.bb
new file mode 100644
index 0000000000..f3bff07530
--- /dev/null
+++ b/packages/busybox/busybox-static_1.2.1.bb
@@ -0,0 +1,6 @@
+require busybox_${PV}.bb
+PR = "r0"
+
+S = "${WORKDIR}/busybox-1.2.1"
+
+export CFLAGS:="${CFLAGS} -static"
diff --git a/packages/helloworld/helloworld_1.0.0.bb b/packages/helloworld/helloworld_1.0.0.bb
index 99ebc051fd..da4daa408d 100644
--- a/packages/helloworld/helloworld_1.0.0.bb
+++ b/packages/helloworld/helloworld_1.0.0.bb
@@ -22,29 +22,3 @@ do_install () {
 	install -d ${D}${base_bindir}
 	ln -sf ${bindir}/helloworld ${D}${base_bindir}/init
 }
-
-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
-}
-