Permalink
Browse files

removing rejected patching

  • Loading branch information...
1 parent fdb77f3 commit 86928efb0d36c4b057d701dbaa7d30bd38b564fb @kartoch kartoch committed May 20, 2011
@@ -1,35 +0,0 @@
-TUNCTL = $(shell [ -e /usr/include/linux/if_tun.h ] && echo tunctl)
-
-SUBDIRS = lib jail jailtest humfsify mconsole moo port-helper $(TUNCTL) \
- uml_net uml_switch watchdog umlfs
-UMLVER = $(shell date +%Y%m%d)
-TARBALL = uml_utilities_$(UMLVER).tar.bz2
-BIN_DIR = /usr/bin
-
-ifeq ($(shell uname -m),x86_64)
-LIB_DIR = /usr/lib64/uml
-else
-LIB_DIR = /usr/lib/uml
-endif
-
-CFLAGS = -g -Wall
-#CFLAGS = -g -O2 -Wall
-
-export BIN_DIR LIB_DIR CFLAGS
-
-all install:
- set -e ; for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@; done
-
-tarball : clean spec
- cd .. ; \
- mv tools tools-$(UMLVER); \
- tar cjf $(TARBALL) tools-$(UMLVER); \
- mv tools-$(UMLVER) tools
-
-clean:
- rm -rf *~
- rm -f uml_util.spec
- set -e ; for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@; done
-
-spec:
- sed -e 's/__UMLVER__/$(UMLVER)/' < uml_util.spec.in > uml_util.spec
@@ -1,11 +0,0 @@
---- Makefile 2004-04-08 03:42:59.000000000 +0200
-+++ Makefile 2009-05-01 23:31:00.106571852 +0200
-@@ -1,7 +1,7 @@
- TUNCTL = $(shell [ -e /usr/include/linux/if_tun.h ] && echo tunctl)
-
- SUBDIRS = jail jailtest humfsify mconsole moo port-helper $(TUNCTL) uml_net \
-- uml_router watchdog
-+ uml_router watchdog uml_dump
- UMLVER = $(shell date +%Y%m%d)
- TARBALL = uml_utilities_$(UMLVER).tar
- BIN_DIR = /usr/bin
Oops, something went wrong.

0 comments on commit 86928ef

Please sign in to comment.