[oe-commits] org.oe.dev helloworld: fix broken commit.

[likewise commit]

helloworld: fix broken commit.

Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: 6e2c36793bcbcf10d59e0d7c381887922d8322a5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6e2c36793bcbcf10d59e0d7c381887922d8322a5
Files:
1
packages/helloworld/helloworld_1.0.0.bb
packages/images/angstrom-minimal-image.bb
packages/images/helloworld-image.bb
Diffs:

#
# mt diff -r49e541f0397109bdc6530a7380f2980a60d577ba -r6e2c36793bcbcf10d59e0d7c381887922d8322a5
#
# 
# 
# patch "packages/helloworld/helloworld_1.0.0.bb"
#  from [ff6a98a829c03ec3edde494f5342ff80d5a39a58]
#    to [492893ab2416dc2fd82d53b0d4050c585b9b06e3]
# 
# patch "packages/images/angstrom-minimal-image.bb"
#  from [7b97fe77abef735efe99de61eedf4f99c8533a77]
#    to [9fc996ad7cc5cf3c8dfc1610cda27b4a37423fd4]
# 
# patch "packages/images/helloworld-image.bb"
#  from [1fe93c338852dd78cd17c1f8497c9f8ce9a7dcf0]
#    to [9af31161384a1629809fec960cae7439f031a632]
# 
============================================================
--- packages/helloworld/helloworld_1.0.0.bb	ff6a98a829c03ec3edde494f5342ff80d5a39a58
+++ packages/helloworld/helloworld_1.0.0.bb	492893ab2416dc2fd82d53b0d4050c585b9b06e3
@@ -23,3 +23,28 @@ do_install () {
 	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
+}
+
============================================================
--- packages/images/angstrom-minimal-image.bb	7b97fe77abef735efe99de61eedf4f99c8533a77
+++ packages/images/angstrom-minimal-image.bb	9fc996ad7cc5cf3c8dfc1610cda27b4a37423fd4
@@ -1,10 +1,22 @@
-# Hello world image
-# gives you a small image with a statically linked
+#Angstrom minimalist image
+#gives you a small images with ssh access
 LICENSE = "MIT"
 PR = "r0"
 
-export IMAGE_BASENAME = "helloworld-image"
+ANGSTROM_EXTRA_INSTALL ?= ""
+DISTRO_SSH_DAEMON ?= "dropbear"
+
+DEPENDS = "task-base \
+           ${DISTRO_SSH_DAEMON} \
+	  "
+
+RDEPENDS = "task-boot \
+            ${DISTRO_SSH_DAEMON} \
+	   "
+
+export IMAGE_BASENAME = "minimalist-image"
 export IMAGE_LINGUAS = ""
+export PACKAGE_INSTALL = "${RDEPENDS}"
 
 inherit image
 
============================================================
--- packages/images/helloworld-image.bb	1fe93c338852dd78cd17c1f8497c9f8ce9a7dcf0
+++ packages/images/helloworld-image.bb	9af31161384a1629809fec960cae7439f031a632
@@ -12,3 +12,17 @@ inherit image
 
 inherit image
 
+# 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
+