import clean BK tree at cset 1.3670

5 files changed, 101 insertions, 0 deletions

diff --git a/packages/bootmenu/.mtn2git_empty b/packages/bootmenu/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bootmenu/.mtn2git_empty
diff --git a/packages/bootmenu/bootmenu-0.6/.mtn2git_empty b/packages/bootmenu/bootmenu-0.6/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bootmenu/bootmenu-0.6/.mtn2git_empty
diff --git a/packages/bootmenu/bootmenu-0.6/compile.patch b/packages/bootmenu/bootmenu-0.6/compile.patch
index e69de29bb2..1d42f59925 100644
--- a/packages/bootmenu/bootmenu-0.6/compile.patch
+++ b/packages/bootmenu/bootmenu-0.6/compile.patch
@@ -0,0 +1,69 @@
+
+#
+# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- bootmenu-0.6/src/Makefile~compile
++++ bootmenu-0.6/src/Makefile
+@@ -20,9 +20,9 @@
+ SOS=
+ 
+ ifeq ($(HAVE_PLUGINS),y)
+-CFLAGS+=-DPLUGINS
+-LDFLAGS += -rdynamic
+-LIBS += -ldl
++override CFLAGS+=-DPLUGINS -D_PLUGINDIR="\"$(PLUGINDIR)\""
++override LDFLAGS += -rdynamic
++override LIBS += -ldl
+ OBJS += plugins.o
+ SOS = $(patsubst %,%.so,$(PLUGINS))
+ 
+@@ -33,20 +33,22 @@
+ endif
+ 
+ ifeq ($(USE_SYSLOG),y)
+-CFLAGS+=-DSYSLOG
++override CFLAGS+=-DSYSLOG
+ else
+ OBJS+=log.o
+ endif
+ 
++DESTDIR=
+ PREFIX=/usr/local/bin
+-PLUGINS=/usr/share/bootmenu
++PLUGINDIR=/usr/share/bootmenu
+ 
+ all: $(APP)
+ 
+ install: $(APP)
+-	cp $(APP) $(PRFIX)/$(APP)
+-	mkdir -p $(PLUGINS)
+-	cp *.so $(PLUGINS)
++	install -d $(DESTDIR)$(PREFIX)
++	install -m 0755 $(APP) $(DESTDIR)$(PREFIX)/$(APP)
++	install -d $(DESTDIR)$(PLUGINDIR)
++	install -m 0755 *.so $(DESTDIR)$(PLUGINDIR)
+ 
+ clean:
+ 	rm -f *.o *.so $(APP)
+@@ -59,7 +61,7 @@
+ #####
+ 
+ %.so: %.c
+-	$(CC) $(CFLAGS) $($(*)_CFLAGS) -shared -o $@ $< $($(*)_LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $($(*)_CFLAGS) -shared -o $@ $< $($(*)_LIBS)
+ 
+ plugins.o: plugins.c
+ 	$(CC) -c $(CFLAGS) -DDEFAULT_PLUGIN="\"$(DEFAULT_PLUGIN)\"" -o $@ $<
+--- bootmenu-0.6/src/plugins.c~compile
++++ bootmenu-0.6/src/plugins.c
+@@ -28,7 +28,9 @@
+ #include <fcntl.h>
+ #include "bootmenu.h"
+ 
++#ifndef _PLUGINDIR
+ #define _PLUGINDIR "/usr/share/bootmenu"
++#endif
+ 
+ extern struct config bootmenu_config;
+ 
diff --git a/packages/bootmenu/bootmenu_0.6.bb b/packages/bootmenu/bootmenu_0.6.bb
index e69de29bb2..c94efcaf90 100644
--- a/packages/bootmenu/bootmenu_0.6.bb
+++ b/packages/bootmenu/bootmenu_0.6.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Pluginable bootup menu."
+SECTION = "base"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.cosmicpenguin.net/pub/bootmenu/bootmenu-${PV}.tar.gz \
+	   file://compile.patch;patch=1"
+
+EXTRA_OEMAKE = ""
+
+do_compile () {
+	oe_runmake -C src 'CC=${CC}' 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}'
+}
+
+do_install () {
+	oe_runmake -C src 'PLUGINDIR=${datadir}/bootmenu' 'PREFIX=${bindir}' 'DESTDIR=${D}' install
+}
diff --git a/packages/bootmenu/bootmenu_0.7.bb b/packages/bootmenu/bootmenu_0.7.bb
index e69de29bb2..f750d47083 100644
--- a/packages/bootmenu/bootmenu_0.7.bb
+++ b/packages/bootmenu/bootmenu_0.7.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Pluginable bootup menu."
+LICENSE="GPL"
+SECTION = "base"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.cosmicpenguin.net/pub/bootmenu/bootmenu-${PV}.tar.gz"
+
+EXTRA_OEMAKE = ""
+
+do_compile () {
+	oe_runmake -C src 'CC=${CC}' 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}'
+}
+
+do_install () {
+	oe_runmake -C src 'PLUGINDIR=${datadir}/bootmenu' 'PREFIX=${bindir}' 'DESTDIR=${D}' install
+}