Message ID | 1381495958-8306-1-git-send-email-stefanha@redhat.com |
---|---|
State | New |
Headers | show |
On 11 October 2013 13:52, Stefan Hajnoczi <stefanha@redhat.com> wrote: > Note that git-submodule(1) does not detect URL changes. The following > commands clear out and re-initialize all submodules to ensure you are > using the latest URLs: > > $ git submodule deinit . # you'll be warned if you have local changes cam-vm-266:precise:qemu$ git submodule deinit . error: pathspec 'deinit' did not match any file(s) known to git. Did you forget to 'git add'? bc895d6d09695d05ceb8b52486ffe861d6cfbdde dtc (v1.3.0) 97336fad32acf802003855cd8bd6477fa49a12e3 pixman (pixman-0.18.4) 8cfdfc43f4c4c8c8dfa4b7cf16f7c19c84eee812 roms/SLOF (qemu-slof-20130430) 09c5109b8585178172c7608de8d52e9d9af0b680 roms/ipxe (v1.0.0-1157-g09c5109) -d363cf50c50c268da7e6d0bf707adde1893d1ab9 roms/openbios -c87a92639b28ac42bc8f6c67443543b405dc479b roms/qemu-palcode +d4f7d90f47462b4e8836899adc5060fbde5253e9 roms/seabios (rel-1.7.2.2) 23d474943dcd55d0550a3d20b3d30e9040a4f15b roms/sgabios (heads/master) 19ea12c230ded95928ecaef0db47a82231c2e485 roms/vgabios (heads/master) ...looks like 'git submodule deinit' requires a fairly recent git version :-( -- PMM
On Fri, Oct 11, 2013 at 02:52:38PM +0200, Stefan Hajnoczi wrote: > qemu.org is held by a third-party and no core community contributor has > access to the DNS configuration. This leaves the website exposed to > outages due to DNS issues or IP address changes. For example, if the > web server IP address needs to change we cannot guarantee qemu.org will > point to it! > > The newer qemu-project.org domain name is owned by Anthony Liguori > <anthony@codemonkey.ws>. You can confirm this by querying the whois > information. Also note that the #qemu IRC channel topic already > references qemu-project.org. > > Short of having a dedicated legal entity to hold the domain name on > behalf of the community, qemu-project.org seems like the safest bet. > > Let's replace references to qemu.org with qemu-project.org. If we change it, we want to tell Google & co. about it. Right now Google probably penalizes the qemu-project.org website because it sees it as a duplication of qemu.org (potentially a non-authorized mirror). This can be accomplished in at least two ways: 1. (recommended) server-side (301) redirects from qemu.org to qemu-project.org: add something like the above to .htaccess files: # wiki/ .htaccess: RedirectMatch 301 /.* http://wiki.qemu-project.org/$1 # / .htaccess RedirectMatch 301 /.* http://qemu-project.org/$1 2. Add canonical links to individual pages https://support.google.com/webmasters/answer/139394?hl=en http://www.techwiki.ordak.org/index.php?title=How_To_Add_Code_To_All_MediaWiki_Pages Just my 2 cents. Cheers. - Ademar > > Note that git-submodule(1) does not detect URL changes. The following > commands clear out and re-initialize all submodules to ensure you are > using the latest URLs: > > $ git submodule deinit . # you'll be warned if you have local changes > $ rm -rf .git/modules # also clear cached .git/ directories > $ git submodule update --init > > Reviewed-by: Markus Armbruster <armbru@redhat.com> > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > v2: > * No code changes > * Add git-submodule(1) commands to refresh repos > > .gitmodules | 14 +++++++------- > Changelog | 2 +- > MAINTAINERS | 8 ++++---- > README | 2 +- > docs/qmp/README | 2 +- > docs/rdma.txt | 2 +- > pc-bios/README | 2 +- > qemu.nsi | 2 +- > scripts/get_maintainer.pl | 2 +- > scripts/qmp/qemu-ga-client | 2 +- > version.rc | 2 +- > 11 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/.gitmodules b/.gitmodules > index d7e3f3c..45e51e7 100644 > --- a/.gitmodules > +++ b/.gitmodules > @@ -1,27 +1,27 @@ > [submodule "roms/vgabios"] > path = roms/vgabios > - url = git://git.qemu.org/vgabios.git/ > + url = git://git.qemu-project.org/vgabios.git/ > [submodule "roms/seabios"] > path = roms/seabios > - url = git://git.qemu.org/seabios.git/ > + url = git://git.qemu-project.org/seabios.git/ > [submodule "roms/SLOF"] > path = roms/SLOF > - url = git://git.qemu.org/SLOF.git > + url = git://git.qemu-project.org/SLOF.git > [submodule "roms/ipxe"] > path = roms/ipxe > - url = git://git.qemu.org/ipxe.git > + url = git://git.qemu-project.org/ipxe.git > [submodule "roms/openbios"] > path = roms/openbios > - url = git://git.qemu.org/openbios.git > + url = git://git.qemu-project.org/openbios.git > [submodule "roms/qemu-palcode"] > path = roms/qemu-palcode > url = git://github.com/rth7680/qemu-palcode.git > [submodule "roms/sgabios"] > path = roms/sgabios > - url = git://git.qemu.org/sgabios.git > + url = git://git.qemu-project.org/sgabios.git > [submodule "pixman"] > path = pixman > url = git://anongit.freedesktop.org/pixman > [submodule "dtc"] > path = dtc > - url = git://git.qemu.org/dtc.git > + url = git://git.qemu-project.org/dtc.git > diff --git a/Changelog b/Changelog > index 13eebef..1249b8a 100644 > --- a/Changelog > +++ b/Changelog > @@ -1,6 +1,6 @@ > This file documents changes for QEMU releases 0.12 and earlier. > For changelog information for later releases, see > -http://wiki.qemu.org/ChangeLog or look at the git history for > +http://wiki.qemu-project.org/ChangeLog or look at the git history for > more detailed information. > > > diff --git a/MAINTAINERS b/MAINTAINERS > index fbe1fd9..3c3e9fe 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -844,21 +844,21 @@ Stable branches > --------------- > Stable 1.0 > L: qemu-stable@nongnu.org > -T: git git://git.qemu.org/qemu-stable-1.0.git > +T: git git://git.qemu-project.org/qemu-stable-1.0.git > S: Orphan > > Stable 0.15 > L: qemu-stable@nongnu.org > M: Andreas Färber <afaerber@suse.de> > -T: git git://git.qemu.org/qemu-stable-0.15.git > +T: git git://git.qemu-project.org/qemu-stable-0.15.git > S: Supported > > Stable 0.14 > L: qemu-stable@nongnu.org > -T: git git://git.qemu.org/qemu-stable-0.14.git > +T: git git://git.qemu-project.org/qemu-stable-0.14.git > S: Orphan > > Stable 0.10 > L: qemu-stable@nongnu.org > -T: git git://git.qemu.org/qemu-stable-0.10.git > +T: git git://git.qemu-project.org/qemu-stable-0.10.git > S: Orphan > diff --git a/README b/README > index c77d126..c7c990d 100644 > --- a/README > +++ b/README > @@ -1,3 +1,3 @@ > -Read the documentation in qemu-doc.html or on http://wiki.qemu.org > +Read the documentation in qemu-doc.html or on http://wiki.qemu-project.org > > - QEMU team > diff --git a/docs/qmp/README b/docs/qmp/README > index 85c4bc1..f6a3a03 100644 > --- a/docs/qmp/README > +++ b/docs/qmp/README > @@ -84,4 +84,4 @@ Please, refer to the qapi-schema.json file for a complete command reference. > QMP wiki page > ------------- > > -http://wiki.qemu.org/QMP > +http://wiki.qemu-project.org/QMP > diff --git a/docs/rdma.txt b/docs/rdma.txt > index 8d1e003..2aca63b 100644 > --- a/docs/rdma.txt > +++ b/docs/rdma.txt > @@ -1,7 +1,7 @@ > (RDMA: Remote Direct Memory Access) > RDMA Live Migration Specification, Version # 1 > ============================================== > -Wiki: http://wiki.qemu.org/Features/RDMALiveMigration > +Wiki: http://wiki.qemu-project.org/Features/RDMALiveMigration > Github: git@github.com:hinesmr/qemu.git, 'rdma' branch > > Copyright (C) 2013 Michael R. Hines <mrhines@us.ibm.com> > diff --git a/pc-bios/README b/pc-bios/README > index d70be16..be8dae0 100644 > --- a/pc-bios/README > +++ b/pc-bios/README > @@ -23,7 +23,7 @@ > legacy x86 software to communicate with an attached serial console as > if a video card were attached. The master sources reside in a subversion > repository at http://sgabios.googlecode.com/svn/trunk. A git mirror is > - available at git://git.qemu.org/sgabios.git. > + available at git://git.qemu-project.org/sgabios.git. > > - The PXE roms come from the iPXE project. Built with BANNER_TIME 0. > Sources available at http://ipxe.org. Vendor:Device ID -> ROM mapping: > diff --git a/qemu.nsi b/qemu.nsi > index 1d57455..0dc1f52 100644 > --- a/qemu.nsi > +++ b/qemu.nsi > @@ -20,7 +20,7 @@ > ; NSIS_WIN32_MAKENSIS > > !define PRODUCT "QEMU" > -!define URL "http://www.qemu.org/" > +!define URL "http://www.qemu-project.org/" > > !define UNINST_EXE "$INSTDIR\qemu-uninstall.exe" > !define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT}" > diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl > index bf5342a..38334de 100755 > --- a/scripts/get_maintainer.pl > +++ b/scripts/get_maintainer.pl > @@ -1385,7 +1385,7 @@ sub vcs_exists { > warn("$P: No supported VCS found. Add --nogit to options?\n"); > warn("Using a git repository produces better results.\n"); > warn("Try latest git repository using:\n"); > - warn("git clone git://git.qemu.org/qemu.git\n"); > + warn("git clone git://git.qemu-project.org/qemu.git\n"); > $printed_novcs = 1; > } > return 0; > diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client > index b5f7e7c..9908f21 100755 > --- a/scripts/qmp/qemu-ga-client > +++ b/scripts/qmp/qemu-ga-client > @@ -33,7 +33,7 @@ > # $ qemu-ga-client fsfreeze freeze > # 2 filesystems frozen > # > -# See also: http://wiki.qemu.org/Features/QAPI/GuestAgent > +# See also: http://wiki.qemu-project.org/Features/QAPI/GuestAgent > # > > import base64 > diff --git a/version.rc b/version.rc > index a50d62f..d42ef62 100644 > --- a/version.rc > +++ b/version.rc > @@ -13,7 +13,7 @@ FILESUBTYPE VFT2_UNKNOWN > { > BLOCK "040904E4" > { > - VALUE "CompanyName", "http://www.qemu.org" > + VALUE "CompanyName", "http://www.qemu-project.org" > VALUE "FileDescription", "QEMU machine emulators and tools" > VALUE "FileVersion", QEMU_VERSION > VALUE "LegalCopyright", "Copyright various authors. Released under the GNU General Public License." > -- > 1.8.3.1 > >
diff --git a/.gitmodules b/.gitmodules index d7e3f3c..45e51e7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,27 +1,27 @@ [submodule "roms/vgabios"] path = roms/vgabios - url = git://git.qemu.org/vgabios.git/ + url = git://git.qemu-project.org/vgabios.git/ [submodule "roms/seabios"] path = roms/seabios - url = git://git.qemu.org/seabios.git/ + url = git://git.qemu-project.org/seabios.git/ [submodule "roms/SLOF"] path = roms/SLOF - url = git://git.qemu.org/SLOF.git + url = git://git.qemu-project.org/SLOF.git [submodule "roms/ipxe"] path = roms/ipxe - url = git://git.qemu.org/ipxe.git + url = git://git.qemu-project.org/ipxe.git [submodule "roms/openbios"] path = roms/openbios - url = git://git.qemu.org/openbios.git + url = git://git.qemu-project.org/openbios.git [submodule "roms/qemu-palcode"] path = roms/qemu-palcode url = git://github.com/rth7680/qemu-palcode.git [submodule "roms/sgabios"] path = roms/sgabios - url = git://git.qemu.org/sgabios.git + url = git://git.qemu-project.org/sgabios.git [submodule "pixman"] path = pixman url = git://anongit.freedesktop.org/pixman [submodule "dtc"] path = dtc - url = git://git.qemu.org/dtc.git + url = git://git.qemu-project.org/dtc.git diff --git a/Changelog b/Changelog index 13eebef..1249b8a 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,6 @@ This file documents changes for QEMU releases 0.12 and earlier. For changelog information for later releases, see -http://wiki.qemu.org/ChangeLog or look at the git history for +http://wiki.qemu-project.org/ChangeLog or look at the git history for more detailed information. diff --git a/MAINTAINERS b/MAINTAINERS index fbe1fd9..3c3e9fe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -844,21 +844,21 @@ Stable branches --------------- Stable 1.0 L: qemu-stable@nongnu.org -T: git git://git.qemu.org/qemu-stable-1.0.git +T: git git://git.qemu-project.org/qemu-stable-1.0.git S: Orphan Stable 0.15 L: qemu-stable@nongnu.org M: Andreas Färber <afaerber@suse.de> -T: git git://git.qemu.org/qemu-stable-0.15.git +T: git git://git.qemu-project.org/qemu-stable-0.15.git S: Supported Stable 0.14 L: qemu-stable@nongnu.org -T: git git://git.qemu.org/qemu-stable-0.14.git +T: git git://git.qemu-project.org/qemu-stable-0.14.git S: Orphan Stable 0.10 L: qemu-stable@nongnu.org -T: git git://git.qemu.org/qemu-stable-0.10.git +T: git git://git.qemu-project.org/qemu-stable-0.10.git S: Orphan diff --git a/README b/README index c77d126..c7c990d 100644 --- a/README +++ b/README @@ -1,3 +1,3 @@ -Read the documentation in qemu-doc.html or on http://wiki.qemu.org +Read the documentation in qemu-doc.html or on http://wiki.qemu-project.org - QEMU team diff --git a/docs/qmp/README b/docs/qmp/README index 85c4bc1..f6a3a03 100644 --- a/docs/qmp/README +++ b/docs/qmp/README @@ -84,4 +84,4 @@ Please, refer to the qapi-schema.json file for a complete command reference. QMP wiki page ------------- -http://wiki.qemu.org/QMP +http://wiki.qemu-project.org/QMP diff --git a/docs/rdma.txt b/docs/rdma.txt index 8d1e003..2aca63b 100644 --- a/docs/rdma.txt +++ b/docs/rdma.txt @@ -1,7 +1,7 @@ (RDMA: Remote Direct Memory Access) RDMA Live Migration Specification, Version # 1 ============================================== -Wiki: http://wiki.qemu.org/Features/RDMALiveMigration +Wiki: http://wiki.qemu-project.org/Features/RDMALiveMigration Github: git@github.com:hinesmr/qemu.git, 'rdma' branch Copyright (C) 2013 Michael R. Hines <mrhines@us.ibm.com> diff --git a/pc-bios/README b/pc-bios/README index d70be16..be8dae0 100644 --- a/pc-bios/README +++ b/pc-bios/README @@ -23,7 +23,7 @@ legacy x86 software to communicate with an attached serial console as if a video card were attached. The master sources reside in a subversion repository at http://sgabios.googlecode.com/svn/trunk. A git mirror is - available at git://git.qemu.org/sgabios.git. + available at git://git.qemu-project.org/sgabios.git. - The PXE roms come from the iPXE project. Built with BANNER_TIME 0. Sources available at http://ipxe.org. Vendor:Device ID -> ROM mapping: diff --git a/qemu.nsi b/qemu.nsi index 1d57455..0dc1f52 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -20,7 +20,7 @@ ; NSIS_WIN32_MAKENSIS !define PRODUCT "QEMU" -!define URL "http://www.qemu.org/" +!define URL "http://www.qemu-project.org/" !define UNINST_EXE "$INSTDIR\qemu-uninstall.exe" !define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT}" diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl index bf5342a..38334de 100755 --- a/scripts/get_maintainer.pl +++ b/scripts/get_maintainer.pl @@ -1385,7 +1385,7 @@ sub vcs_exists { warn("$P: No supported VCS found. Add --nogit to options?\n"); warn("Using a git repository produces better results.\n"); warn("Try latest git repository using:\n"); - warn("git clone git://git.qemu.org/qemu.git\n"); + warn("git clone git://git.qemu-project.org/qemu.git\n"); $printed_novcs = 1; } return 0; diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client index b5f7e7c..9908f21 100755 --- a/scripts/qmp/qemu-ga-client +++ b/scripts/qmp/qemu-ga-client @@ -33,7 +33,7 @@ # $ qemu-ga-client fsfreeze freeze # 2 filesystems frozen # -# See also: http://wiki.qemu.org/Features/QAPI/GuestAgent +# See also: http://wiki.qemu-project.org/Features/QAPI/GuestAgent # import base64 diff --git a/version.rc b/version.rc index a50d62f..d42ef62 100644 --- a/version.rc +++ b/version.rc @@ -13,7 +13,7 @@ FILESUBTYPE VFT2_UNKNOWN { BLOCK "040904E4" { - VALUE "CompanyName", "http://www.qemu.org" + VALUE "CompanyName", "http://www.qemu-project.org" VALUE "FileDescription", "QEMU machine emulators and tools" VALUE "FileVersion", QEMU_VERSION VALUE "LegalCopyright", "Copyright various authors. Released under the GNU General Public License."