| Message ID | 1314980106-3500-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
Ping? Anthony? (I should probably have cc'd you in the first place, sorry) -- PMM On 2 September 2011 17:15, Peter Maydell <peter.maydell@linaro.org> wrote: > Remove the 'tarbin' target -- it isn't used as part of the official > QEMU release process, and it's out of date (various new bios files > were never added to its list of files). It's better not to provide > it at all than to have a broken makefile target we never use or test. > > (Creating a tarball by just pulling in binaries that have been installed > directly to the system you're running the build on is a bad idea anyway: > the better way to create a binary tarball would be just to install to > a temporary DESTDIR and then tar up that.) > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > Who distributes binaries in tarballs these days anyway? :-) > > Makefile | 37 ------------------------------------- > 1 files changed, 0 insertions(+), 37 deletions(-) > > diff --git a/Makefile b/Makefile > index 8606849..4f2bda1 100644 > --- a/Makefile > +++ b/Makefile > @@ -364,42 +364,5 @@ tar: > cd /tmp && tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS --exclude .git --exclude .svn > rm -rf /tmp/$(FILE) > > -SYSTEM_TARGETS=$(filter %-softmmu,$(TARGET_DIRS)) > -SYSTEM_PROGS=$(patsubst qemu-system-i386,qemu, \ > - $(patsubst %-softmmu,qemu-system-%, \ > - $(SYSTEM_TARGETS))) > - > -USER_TARGETS=$(filter %-user,$(TARGET_DIRS)) > -USER_PROGS=$(patsubst %-bsd-user,qemu-%, \ > - $(patsubst %-darwin-user,qemu-%, \ > - $(patsubst %-linux-user,qemu-%, \ > - $(USER_TARGETS)))) > - > -# generate a binary distribution > -tarbin: > - cd / && tar zcvf ~/qemu-$(VERSION)-$(ARCH).tar.gz \ > - $(patsubst %,$(bindir)/%, $(SYSTEM_PROGS)) \ > - $(patsubst %,$(bindir)/%, $(USER_PROGS)) \ > - $(bindir)/qemu-img \ > - $(bindir)/qemu-nbd \ > - $(datadir)/bios.bin \ > - $(datadir)/vgabios.bin \ > - $(datadir)/vgabios-cirrus.bin \ > - $(datadir)/ppc_rom.bin \ > - $(datadir)/openbios-sparc32 \ > - $(datadir)/openbios-sparc64 \ > - $(datadir)/openbios-ppc \ > - $(datadir)/pxe-e1000.rom \ > - $(datadir)/pxe-eepro100.rom \ > - $(datadir)/pxe-ne2k_pci.rom \ > - $(datadir)/pxe-pcnet.rom \ > - $(datadir)/pxe-rtl8139.rom \ > - $(datadir)/pxe-virtio.rom \ > - $(docdir)/qemu-doc.html \ > - $(docdir)/qemu-tech.html \ > - $(mandir)/man1/qemu.1 \ > - $(mandir)/man1/qemu-img.1 \ > - $(mandir)/man8/qemu-nbd.8 > - > # Include automatically generated dependency files > -include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d qapi/*.d qga/*.d) > -- > 1.7.1
On 09/14/2011 11:25 AM, Peter Maydell wrote: > Ping? Anthony? (I should probably have cc'd you in the first place, > sorry) Weird. I dropped this patch but I don't know why. Doesn't look like I sent out a mail about it. I'll requeue it. Regards, Anthony Liguori > > -- PMM > > On 2 September 2011 17:15, Peter Maydell<peter.maydell@linaro.org> wrote: >> Remove the 'tarbin' target -- it isn't used as part of the official >> QEMU release process, and it's out of date (various new bios files >> were never added to its list of files). It's better not to provide >> it at all than to have a broken makefile target we never use or test. >> >> (Creating a tarball by just pulling in binaries that have been installed >> directly to the system you're running the build on is a bad idea anyway: >> the better way to create a binary tarball would be just to install to >> a temporary DESTDIR and then tar up that.) >> >> Signed-off-by: Peter Maydell<peter.maydell@linaro.org> >> --- >> Who distributes binaries in tarballs these days anyway? :-) >> >> Makefile | 37 ------------------------------------- >> 1 files changed, 0 insertions(+), 37 deletions(-) >> >> diff --git a/Makefile b/Makefile >> index 8606849..4f2bda1 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -364,42 +364,5 @@ tar: >> cd /tmp&& tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS --exclude .git --exclude .svn >> rm -rf /tmp/$(FILE) >> >> -SYSTEM_TARGETS=$(filter %-softmmu,$(TARGET_DIRS)) >> -SYSTEM_PROGS=$(patsubst qemu-system-i386,qemu, \ >> - $(patsubst %-softmmu,qemu-system-%, \ >> - $(SYSTEM_TARGETS))) >> - >> -USER_TARGETS=$(filter %-user,$(TARGET_DIRS)) >> -USER_PROGS=$(patsubst %-bsd-user,qemu-%, \ >> - $(patsubst %-darwin-user,qemu-%, \ >> - $(patsubst %-linux-user,qemu-%, \ >> - $(USER_TARGETS)))) >> - >> -# generate a binary distribution >> -tarbin: >> - cd /&& tar zcvf ~/qemu-$(VERSION)-$(ARCH).tar.gz \ >> - $(patsubst %,$(bindir)/%, $(SYSTEM_PROGS)) \ >> - $(patsubst %,$(bindir)/%, $(USER_PROGS)) \ >> - $(bindir)/qemu-img \ >> - $(bindir)/qemu-nbd \ >> - $(datadir)/bios.bin \ >> - $(datadir)/vgabios.bin \ >> - $(datadir)/vgabios-cirrus.bin \ >> - $(datadir)/ppc_rom.bin \ >> - $(datadir)/openbios-sparc32 \ >> - $(datadir)/openbios-sparc64 \ >> - $(datadir)/openbios-ppc \ >> - $(datadir)/pxe-e1000.rom \ >> - $(datadir)/pxe-eepro100.rom \ >> - $(datadir)/pxe-ne2k_pci.rom \ >> - $(datadir)/pxe-pcnet.rom \ >> - $(datadir)/pxe-rtl8139.rom \ >> - $(datadir)/pxe-virtio.rom \ >> - $(docdir)/qemu-doc.html \ >> - $(docdir)/qemu-tech.html \ >> - $(mandir)/man1/qemu.1 \ >> - $(mandir)/man1/qemu-img.1 \ >> - $(mandir)/man8/qemu-nbd.8 >> - >> # Include automatically generated dependency files >> -include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d qapi/*.d qga/*.d) >> -- >> 1.7.1
On 09/02/2011 11:15 AM, Peter Maydell wrote: > Remove the 'tarbin' target -- it isn't used as part of the official > QEMU release process, and it's out of date (various new bios files > were never added to its list of files). It's better not to provide > it at all than to have a broken makefile target we never use or test. > > (Creating a tarball by just pulling in binaries that have been installed > directly to the system you're running the build on is a bad idea anyway: > the better way to create a binary tarball would be just to install to > a temporary DESTDIR and then tar up that.) > > Signed-off-by: Peter Maydell<peter.maydell@linaro.org> Can you rebase this patch? git-am things this patch was already applied which is why I dropped it in the first place. It's because the SYSTEM_PROGS variable has changed a little bit from when you first submitted. Regards, Anthony Liguori > --- > Who distributes binaries in tarballs these days anyway? :-) > > Makefile | 37 ------------------------------------- > 1 files changed, 0 insertions(+), 37 deletions(-) > > diff --git a/Makefile b/Makefile > index 8606849..4f2bda1 100644 > --- a/Makefile > +++ b/Makefile > @@ -364,42 +364,5 @@ tar: > cd /tmp&& tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS --exclude .git --exclude .svn > rm -rf /tmp/$(FILE) > > -SYSTEM_TARGETS=$(filter %-softmmu,$(TARGET_DIRS)) > -SYSTEM_PROGS=$(patsubst qemu-system-i386,qemu, \ > - $(patsubst %-softmmu,qemu-system-%, \ > - $(SYSTEM_TARGETS))) > - > -USER_TARGETS=$(filter %-user,$(TARGET_DIRS)) > -USER_PROGS=$(patsubst %-bsd-user,qemu-%, \ > - $(patsubst %-darwin-user,qemu-%, \ > - $(patsubst %-linux-user,qemu-%, \ > - $(USER_TARGETS)))) > - > -# generate a binary distribution > -tarbin: > - cd /&& tar zcvf ~/qemu-$(VERSION)-$(ARCH).tar.gz \ > - $(patsubst %,$(bindir)/%, $(SYSTEM_PROGS)) \ > - $(patsubst %,$(bindir)/%, $(USER_PROGS)) \ > - $(bindir)/qemu-img \ > - $(bindir)/qemu-nbd \ > - $(datadir)/bios.bin \ > - $(datadir)/vgabios.bin \ > - $(datadir)/vgabios-cirrus.bin \ > - $(datadir)/ppc_rom.bin \ > - $(datadir)/openbios-sparc32 \ > - $(datadir)/openbios-sparc64 \ > - $(datadir)/openbios-ppc \ > - $(datadir)/pxe-e1000.rom \ > - $(datadir)/pxe-eepro100.rom \ > - $(datadir)/pxe-ne2k_pci.rom \ > - $(datadir)/pxe-pcnet.rom \ > - $(datadir)/pxe-rtl8139.rom \ > - $(datadir)/pxe-virtio.rom \ > - $(docdir)/qemu-doc.html \ > - $(docdir)/qemu-tech.html \ > - $(mandir)/man1/qemu.1 \ > - $(mandir)/man1/qemu-img.1 \ > - $(mandir)/man8/qemu-nbd.8 > - > # Include automatically generated dependency files > -include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d qapi/*.d qga/*.d)
diff --git a/Makefile b/Makefile index 8606849..4f2bda1 100644 --- a/Makefile +++ b/Makefile @@ -364,42 +364,5 @@ tar: cd /tmp && tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS --exclude .git --exclude .svn rm -rf /tmp/$(FILE) -SYSTEM_TARGETS=$(filter %-softmmu,$(TARGET_DIRS)) -SYSTEM_PROGS=$(patsubst qemu-system-i386,qemu, \ - $(patsubst %-softmmu,qemu-system-%, \ - $(SYSTEM_TARGETS))) - -USER_TARGETS=$(filter %-user,$(TARGET_DIRS)) -USER_PROGS=$(patsubst %-bsd-user,qemu-%, \ - $(patsubst %-darwin-user,qemu-%, \ - $(patsubst %-linux-user,qemu-%, \ - $(USER_TARGETS)))) - -# generate a binary distribution -tarbin: - cd / && tar zcvf ~/qemu-$(VERSION)-$(ARCH).tar.gz \ - $(patsubst %,$(bindir)/%, $(SYSTEM_PROGS)) \ - $(patsubst %,$(bindir)/%, $(USER_PROGS)) \ - $(bindir)/qemu-img \ - $(bindir)/qemu-nbd \ - $(datadir)/bios.bin \ - $(datadir)/vgabios.bin \ - $(datadir)/vgabios-cirrus.bin \ - $(datadir)/ppc_rom.bin \ - $(datadir)/openbios-sparc32 \ - $(datadir)/openbios-sparc64 \ - $(datadir)/openbios-ppc \ - $(datadir)/pxe-e1000.rom \ - $(datadir)/pxe-eepro100.rom \ - $(datadir)/pxe-ne2k_pci.rom \ - $(datadir)/pxe-pcnet.rom \ - $(datadir)/pxe-rtl8139.rom \ - $(datadir)/pxe-virtio.rom \ - $(docdir)/qemu-doc.html \ - $(docdir)/qemu-tech.html \ - $(mandir)/man1/qemu.1 \ - $(mandir)/man1/qemu-img.1 \ - $(mandir)/man8/qemu-nbd.8 - # Include automatically generated dependency files -include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d qapi/*.d qga/*.d)
Remove the 'tarbin' target -- it isn't used as part of the official QEMU release process, and it's out of date (various new bios files were never added to its list of files). It's better not to provide it at all than to have a broken makefile target we never use or test. (Creating a tarball by just pulling in binaries that have been installed directly to the system you're running the build on is a bad idea anyway: the better way to create a binary tarball would be just to install to a temporary DESTDIR and then tar up that.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- Who distributes binaries in tarballs these days anyway? :-) Makefile | 37 ------------------------------------- 1 files changed, 0 insertions(+), 37 deletions(-)