diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /bootmenu | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'bootmenu')
| -rw-r--r-- | bootmenu/bootmenu-0.6/compile.patch | 69 | ||||
| -rw-r--r-- | bootmenu/bootmenu_0.6.bb | 0 | ||||
| -rw-r--r-- | bootmenu/bootmenu_0.7.bb | 0 |
3 files changed, 0 insertions, 69 deletions
diff --git a/bootmenu/bootmenu-0.6/compile.patch b/bootmenu/bootmenu-0.6/compile.patch deleted file mode 100644 index 1d42f59925..0000000000 --- a/bootmenu/bootmenu-0.6/compile.patch +++ /dev/null @@ -1,69 +0,0 @@ - -# -# 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/bootmenu/bootmenu_0.6.bb b/bootmenu/bootmenu_0.6.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/bootmenu/bootmenu_0.6.bb +++ /dev/null diff --git a/bootmenu/bootmenu_0.7.bb b/bootmenu/bootmenu_0.7.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/bootmenu/bootmenu_0.7.bb +++ /dev/null |