From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:45972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzwWb-00018D-Fk for qemu-devel@nongnu.org; Sat, 03 Sep 2011 16:09:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QzwWa-0005Xu-84 for qemu-devel@nongnu.org; Sat, 03 Sep 2011 16:09:09 -0400 Received: from mail-yx0-f173.google.com ([209.85.213.173]:40069) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzwWa-0005Xq-4C for qemu-devel@nongnu.org; Sat, 03 Sep 2011 16:09:08 -0400 Received: by yxt3 with SMTP id 3so1992094yxt.4 for ; Sat, 03 Sep 2011 13:09:07 -0700 (PDT) Message-ID: <4E628961.7030809@codemonkey.ws> Date: Sat, 03 Sep 2011 15:09:05 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1314629736-13023-1-git-send-email-aliguori@us.ibm.com> <4E60F8D8.2080605@us.ibm.com> <069ADDF5-0DF7-485C-9BF7-C7F697017070@web.de> In-Reply-To: <069ADDF5-0DF7-485C-9BF7-C7F697017070@web.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH] Rename qemu -> qemu-system-i386 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?ISO-8859-1?Q?Andreas_F=E4rber?= Cc: Blue Swirl , Anthony Liguori , qemu-devel@nongnu.org On 09/03/2011 08:44 AM, Andreas Färber wrote: > Am 02.09.2011 um 17:40 schrieb Anthony Liguori: > >> On 08/29/2011 09:55 AM, Anthony Liguori wrote: >>> This has been discussed before in the past. The special casing really >>> makes no >>> sense anymore. This seems like a good change to make for 1.0. >>> >>> Signed-off-by: Anthony Liguori >> >> Applied. >> >> Regards, >> >> Anthony Liguori >> >>> --- >>> Makefile | 5 ++--- >>> Makefile.target | 4 ---- >>> 2 files changed, 2 insertions(+), 7 deletions(-) >>> >>> diff --git a/Makefile b/Makefile >>> index 8606849..51ecdb5 100644 >>> --- a/Makefile >>> +++ b/Makefile >>> @@ -365,9 +365,8 @@ tar: >>> rm -rf /tmp/$(FILE) >>> >>> SYSTEM_TARGETS=$(filter %-softmmu,$(TARGET_DIRS)) >>> -SYSTEM_PROGS=$(patsubst qemu-system-i386,qemu, \ >>> - $(patsubst %-softmmu,qemu-system-%, \ >>> - $(SYSTEM_TARGETS))) >>> +SYSTEM_PROGS=$(patsubst %-softmmu,qemu-system-%, \ >>> + $(SYSTEM_TARGETS)) >>> >>> USER_TARGETS=$(filter %-user,$(TARGET_DIRS)) >>> USER_PROGS=$(patsubst %-bsd-user,qemu-%, \ >>> diff --git a/Makefile.target b/Makefile.target >>> index 07af4d4..29287ed 100644 >>> --- a/Makefile.target >>> +++ b/Makefile.target >>> @@ -27,12 +27,8 @@ ifdef CONFIG_USER_ONLY >>> QEMU_PROG=qemu-$(TARGET_ARCH2) >>> else >>> # system emulator name >>> -ifeq ($(TARGET_ARCH), i386) >>> -QEMU_PROG=qemu$(EXESUF) >>> -else >>> QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF) >>> endif >>> -endif >>> >>> PROGS=$(QEMU_PROG) >>> STPFILES= > > This will leave an old qemu executable from a previous `make install` > behind. You're not supposed to do a make install on top of another install. You're supposed to first do a make uninstall in the old tree than a make install in the new tree. Semantically, this is how a distro package upgrade works. > We should check for it and, unless it's a symlink to qemu-system-i386, > remove it in the install target. Once we're no longer generating an executable, we should be removing it from the system. It's up to the user to remove old files from the system. Regards, Anthony Liguori > > Andreas >