diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-oe/recipes-extended/uml-utilities | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/uml-utilities')
4 files changed, 256 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch b/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch new file mode 100644 index 000000000..38e945d64 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch @@ -0,0 +1,41 @@ +From a8d85949a068ee6cd9a2f923cd039047993f239e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 3 Apr 2017 17:11:32 -0700 +Subject: [PATCH] include required system header files for fd_set and makedev + +fd_set comes from sys/select.h +makedev macro is defined in sys/sysmacros.h + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + uml_net/ethertap.c | 1 + + uml_net/host.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/uml_net/ethertap.c b/uml_net/ethertap.c +index ddd41f2..57f7119 100644 +--- a/uml_net/ethertap.c ++++ b/uml_net/ethertap.c +@@ -11,6 +11,7 @@ + #include <sys/signal.h> + #include <sys/socket.h> + #include <sys/stat.h> ++#include <sys/select.h> + #include <sys/ioctl.h> + #include <net/if.h> + #include "host.h" +diff --git a/uml_net/host.c b/uml_net/host.c +index 65c20df..fc04cd4 100644 +--- a/uml_net/host.c ++++ b/uml_net/host.c +@@ -10,6 +10,7 @@ + #include <ctype.h> + #include <sys/wait.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include "output.h" + #include "host.h" + +-- +2.12.2 + diff --git a/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch b/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch new file mode 100644 index 000000000..f4a175cdf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch @@ -0,0 +1,104 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- tools/mconsole/Makefile~fix-ldflags 2003-02-08 05:10:08.000000000 +0100 ++++ tools/mconsole/Makefile 2004-04-01 15:37:37.000000000 +0200 +@@ -7,7 +7,7 @@ + all : $(BIN) + + $(BIN) : $(OBJS) +- $(CC) $(CFLAGS) -o $(BIN) $(OBJS) -lreadline -lncurses ++ $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LDFLAGS) -lreadline -lncurses + + clean : + rm -f $(BIN) $(OBJS) *~ +diff -uNr tools.orig/jailtest/Makefile tools/jailtest/Makefile +--- tools.orig/jailtest/Makefile 2017-04-03 15:56:02.068461380 +0200 ++++ tools/jailtest/Makefile 2017-04-03 16:00:04.857449005 +0200 +@@ -7,7 +7,7 @@ + all : $(BIN) + + $(BIN) : $(OBJS) +- $(CC) $(CFLAGS) -o $(BIN) $(OBJS) ++ $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LDFLAGS) + + clean : + rm -f $(BIN) $(OBJS) *~ +diff -uNr tools.orig/moo/Makefile tools/moo/Makefile +--- tools.orig/moo/Makefile 2017-04-03 15:56:02.068461380 +0200 ++++ tools/moo/Makefile 2017-04-03 15:59:56.466449432 +0200 +@@ -10,10 +10,10 @@ + all : $(BIN) + + uml_moo : $(uml_moo_OBJS) +- $(CC) $(CFLAGS) -o $@ $($@_OBJS) ++ $(CC) $(CFLAGS) -o $@ $($@_OBJS) $(LDFLAGS) + + uml_mkcow : $(uml_mkcow_OBJS) +- $(CC) $(CFLAGS) -o $@ $($@_OBJS) ++ $(CC) $(CFLAGS) -o $@ $($@_OBJS) $(LDFLAGS) + + $(uml_moo_OBJS) $(uml_mkcow_OBJS) : cow.h cow_sys.h + +diff -uNr tools.orig/port-helper/Makefile tools/port-helper/Makefile +--- tools.orig/port-helper/Makefile 2017-04-03 15:56:02.068461380 +0200 ++++ tools/port-helper/Makefile 2017-04-03 15:59:41.251450208 +0200 +@@ -7,7 +7,7 @@ + all : $(BIN) + + $(BIN) : $(OBJS) +- $(CC) $(CFLAGS) -o $(BIN) $(OBJS) ++ $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LDFLAGS) + + clean : + rm -f $(BIN) $(OBJS) *~ +diff -uNr tools.orig/tunctl/Makefile tools/tunctl/Makefile +--- tools.orig/tunctl/Makefile 2017-04-03 15:56:02.068461380 +0200 ++++ tools/tunctl/Makefile 2017-04-03 16:00:01.091449197 +0200 +@@ -7,7 +7,7 @@ + all : $(BIN) + + $(BIN) : $(OBJS) +- $(CC) $(CFLAGS) -o $(BIN) $(OBJS) ++ $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LDFLAGS) + + clean : + rm -f $(BIN) $(OBJS) *~ +diff -uNr tools.orig/uml_net/Makefile tools/uml_net/Makefile +--- tools.orig/uml_net/Makefile 2017-04-03 15:56:02.068461380 +0200 ++++ tools/uml_net/Makefile 2017-04-03 16:00:12.449448618 +0200 +@@ -14,7 +14,7 @@ + all : $(BIN) + + $(BIN) : $(OBJS) +- $(CC) $(CFLAGS) -o $(BIN) $(OBJS) ++ $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LDFLAGS) + + clean : + rm -f $(BIN) $(OBJS) *~ +diff -uNr tools.orig/uml_router/Makefile tools/uml_router/Makefile +--- tools.orig/uml_router/Makefile 2017-04-03 15:56:02.068461380 +0200 ++++ tools/uml_router/Makefile 2017-04-03 16:00:46.796446867 +0200 +@@ -13,7 +13,7 @@ + all : $(BIN) + + $(BIN) : $(OBJS) +- $(CC) $(CFLAGS) -o $(BIN) $(OBJS) ++ $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LDFLAGS) + + clean : + rm -f $(BIN) $(OBJS) *~ +diff -uNr tools.orig/watchdog/Makefile tools/watchdog/Makefile +--- tools.orig/watchdog/Makefile 2017-04-03 15:56:02.068461380 +0200 ++++ tools/watchdog/Makefile 2017-04-03 15:59:45.216450006 +0200 +@@ -7,7 +7,7 @@ + all : $(BIN) + + $(BIN) : $(OBJS) +- $(CC) $(CFLAGS) -o $(BIN) $(OBJS) ++ $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LDFLAGS) + + clean : + rm -f $(BIN) $(OBJS) *~ diff --git a/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch b/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch new file mode 100644 index 000000000..868001dbd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch @@ -0,0 +1,84 @@ +Dont strip during install let the packaging handle it + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: tools/jailtest/Makefile +=================================================================== +--- tools.orig/jailtest/Makefile 2003-02-07 20:10:27.000000000 -0800 ++++ tools/jailtest/Makefile 2012-09-05 12:13:56.061615854 -0700 +@@ -14,4 +14,4 @@ + + install : $(BIN) + install -d $(DESTDIR)$(BIN_DIR) +- install -s $(BIN) $(DESTDIR)$(BIN_DIR) ++ install $(BIN) $(DESTDIR)$(BIN_DIR) +Index: tools/mconsole/Makefile +=================================================================== +--- tools.orig/mconsole/Makefile 2012-09-05 12:05:09.869607043 -0700 ++++ tools/mconsole/Makefile 2012-09-05 12:14:07.725607469 -0700 +@@ -14,4 +14,4 @@ + + install : $(BIN) + install -d $(DESTDIR)$(BIN_DIR) +- install -s $(BIN) $(DESTDIR)$(BIN_DIR) ++ install $(BIN) $(DESTDIR)$(BIN_DIR) +Index: tools/moo/Makefile +=================================================================== +--- tools.orig/moo/Makefile 2003-06-26 09:27:00.000000000 -0700 ++++ tools/moo/Makefile 2012-09-05 12:14:20.981604580 -0700 +@@ -22,4 +22,4 @@ + + install : $(BIN) + install -d $(DESTDIR)$(BIN_DIR) +- install -s $(BIN) $(DESTDIR)$(BIN_DIR) ++ install $(BIN) $(DESTDIR)$(BIN_DIR) +Index: tools/port-helper/Makefile +=================================================================== +--- tools.orig/port-helper/Makefile 2003-02-07 20:05:31.000000000 -0800 ++++ tools/port-helper/Makefile 2012-09-05 12:14:39.429609678 -0700 +@@ -14,4 +14,4 @@ + + install : $(BIN) + install -d $(DESTDIR)$(LIB_DIR) +- install -s $(BIN) $(DESTDIR)$(LIB_DIR) ++ install $(BIN) $(DESTDIR)$(LIB_DIR) +Index: tools/tunctl/Makefile +=================================================================== +--- tools.orig/tunctl/Makefile 2003-02-07 20:05:04.000000000 -0800 ++++ tools/tunctl/Makefile 2012-09-05 12:14:49.985606470 -0700 +@@ -14,4 +14,4 @@ + + install : $(BIN) + install -d $(DESTDIR)$(BIN_DIR) +- install -s $(BIN) $(DESTDIR)$(BIN_DIR) ++ install $(BIN) $(DESTDIR)$(BIN_DIR) +Index: tools/uml_net/Makefile +=================================================================== +--- tools.orig/uml_net/Makefile 2003-02-07 20:04:55.000000000 -0800 ++++ tools/uml_net/Makefile 2012-09-05 12:15:00.961607290 -0700 +@@ -21,4 +21,4 @@ + + install : $(BIN) + install -d $(DESTDIR)$(BIN_DIR) +- install -s -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR) ++ install -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR) +Index: tools/uml_router/Makefile +=================================================================== +--- tools.orig/uml_router/Makefile 2003-02-07 20:04:39.000000000 -0800 ++++ tools/uml_router/Makefile 2012-09-05 12:15:10.649607571 -0700 +@@ -20,4 +20,4 @@ + + install : $(BIN) + install -d $(DESTDIR)$(BIN_DIR) +- install -s $(BIN) $(DESTDIR)$(BIN_DIR) ++ install $(BIN) $(DESTDIR)$(BIN_DIR) +Index: tools/watchdog/Makefile +=================================================================== +--- tools.orig/watchdog/Makefile 2003-02-07 20:04:25.000000000 -0800 ++++ tools/watchdog/Makefile 2012-09-05 12:15:35.561612203 -0700 +@@ -14,4 +14,4 @@ + + install : $(BIN) + install -d $(DESTDIR)$(BIN_DIR) +- install -s $(BIN) $(DESTDIR)$(BIN_DIR) ++ install $(BIN) $(DESTDIR)$(BIN_DIR) diff --git a/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb new file mode 100644 index 000000000..ed19d1e41 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb @@ -0,0 +1,27 @@ +SECTION = "console/utils" +SUMMARY = "Utilities for User-Mode-Linux" +LICENSE = "GPL-2.0" +DEPENDS = "zlib ncurses readline" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" +SRC_URI = "http://downloads.sourceforge.net/project/user-mode-linux/tools/1/uml_utilities_${PV}.tar.bz2 \ + file://fix-ldflags.patch \ + file://unstrip.patch \ + file://0001-include-required-system-header-files-for-fd_set-and-.patch \ + " +SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a" +SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41" + +PR = "r1" + +S = "${WORKDIR}/tools" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install DESTDIR=${D} +} + +FILES_${PN} += "${exec_prefix}${nonarch_base_libdir}" +FILES_${PN}-dbg += "${exec_prefix}${nonarch_base_libdir}/uml/.debug" |