commit: d9cb012b6f360549398af0fdc3120862f2475b26 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> AuthorDate: Tue Oct 6 02:30:35 2015 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Tue Oct 6 02:30:35 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d9cb012b
update various URLs A lot of these have rotted -- like old Gentoo sites now in the wiki. Also switch to https:// whenever possible. README | 6 +++--- catalyst/base/stagebase.py | 2 +- doc/HOWTO.txt | 9 ++++----- doc/catalyst-config.5.txt | 2 +- doc/catalyst-spec.5.txt | 2 +- doc/catalyst.1.txt | 6 +++--- examples/README | 4 ++-- examples/generic_stage_template.spec | 2 +- examples/grp_template.spec | 2 +- examples/livecd-stage1_template.spec | 2 +- examples/livecd-stage2_template.spec | 2 +- examples/netboot_template.spec | 2 +- examples/stage4_template.spec | 2 +- examples/tinderbox_template.spec | 2 +- livecd/files/gamecd.motd.txt | 2 +- livecd/files/livecd.motd.txt | 2 +- livecd/files/minimal.motd.txt | 4 ++-- setup.py | 4 ++-- targets/netboot/netboot-combine.sh | 2 +- targets/support/chroot-functions.sh | 4 ++-- targets/support/livecdfs-update.sh | 4 ++-- 21 files changed, 33 insertions(+), 34 deletions(-) diff --git a/README b/README index 46a99e8..94755ba 100644 --- a/README +++ b/README @@ -58,13 +58,13 @@ sharedir="/usr/share/catalyst" There are many more options that can be set, but those defaults are good for out of the box operation. For more documentation on what you can do -with catalyst, please check the man page or the online documentation at -http://www.gentoo.org/proj/en/releng/catalyst. +with catalyst, please check the man page or the online documentation at: +https://wiki.gentoo.org/wiki/Catalyst Bugs ======================== If you have questions or wish to help with development, contact the gentoo-catal...@lists.gentoo.org mailing list. Bug reports should be -filed at http://tinyurl.com/79slrk (http://bugs.gentoo.org) under the +filed at http://tinyurl.com/79slrk (https://bugs.gentoo.org) under the "Catalyst" component of the "Gentoo Hosted Projects" product. diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index c6eaaa3..8a7456e 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1120,7 +1120,7 @@ class StageBase(TargetBase, ClearBase, GenBase): myf.write('CBUILD="'+self.settings["CBUILD"]+'"\n') if "CHOST" in self.settings: - myf.write("# WARNING: Changing your CHOST is not something that should be done lightly.\n# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.\n") + myf.write("# WARNING: Changing your CHOST is not something that should be done lightly.\n# Please consult https://wiki.gentoo.org/wiki/Changing_the_CHOST_variable before changing.\n") myf.write('CHOST="'+self.settings["CHOST"]+'"\n') """ Figure out what our USE vars are for building """ diff --git a/doc/HOWTO.txt b/doc/HOWTO.txt index cec22c3..b1d315e 100644 --- a/doc/HOWTO.txt +++ b/doc/HOWTO.txt @@ -33,13 +33,13 @@ Stage3 tarball Get a stage3 tarball (containing the build tools you'll need to construct your stage1) from your local -http://www.gentoo.org/main/en/mirrors.xml[Gentoo mirror]. +https://www.gentoo.org/downloads/mirrors/[Gentoo mirror]. $GENTOO_MIRROR/releases/$ARCH/current-stage3/ For example, - http://distfiles.gentoo.org/releases/amd64/current-stage3/stage3-amd64-20121213.tar.bz2 + http://distfiles.gentoo.org/releases/amd64/autobuilds/current-stage3-amd64/stage3-amd64-20121213.tar.bz2 Grab the tarball and put it where catalyst will find it: @@ -164,7 +164,7 @@ Once we have a stage2, Catalyst builds all of the base system packages for stage3, rebuilding any that were already built in stage2 (`emerge -e @system`). The `@system` set of packages is defined by `packages` files in your cascading profile. See -http://dev.gentoo.org/~ulm/pms/5/pms.html#x1-520005.2.6[the Package +https://dev.gentoo.org/~ulm/pms/5/pms.html#x1-520005.2.6[the Package Manager Specification] for details. For more details on the differences between the stages, look at the @@ -225,8 +225,7 @@ and `dd`: # dd if=filename.iso of=/dev/sdX replacing `X` with the appropriate drive letter for your USB disk. -See https://bugs.gentoo.org/show_bug.cgi?id=251719[bug 251719] for -details. +See https://bugs.gentoo.org/251719[bug 251719] for details. Running catalyst from a Git checkout ------------------------------------ diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt index 61f3d93..31c4fe9 100644 --- a/doc/catalyst-config.5.txt +++ b/doc/catalyst-config.5.txt @@ -225,7 +225,7 @@ An example configuration file can be found at BUGS ---- An up-to-date list of Catalyst bugs can always be found listed on the Gentoo -Linux bug-tracking system at `http://bugs.gentoo.org`. +Linux bug-tracking system at `https://bugs.gentoo.org`. SEE ALSO diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt index cba3166..a1559fa 100644 --- a/doc/catalyst-spec.5.txt +++ b/doc/catalyst-spec.5.txt @@ -509,7 +509,7 @@ include::subarches.generated.txt[tabsize=4] BUGS ---- An up-to-date list of Catalyst bugs can always be found listed on the Gentoo -Linux bug-tracking system at 'http://bugs.gentoo.org'. +Linux bug-tracking system at 'https://bugs.gentoo.org'. SEE ALSO diff --git a/doc/catalyst.1.txt b/doc/catalyst.1.txt index 9f70f78..5a7a4d6 100644 --- a/doc/catalyst.1.txt +++ b/doc/catalyst.1.txt @@ -23,7 +23,7 @@ Platform (GRP) sets. *catalyst* is also capable of providing a simple tinderbox environment for ebuild/package testing. For more information, please visit the *catalyst* project page -on the web at 'http://www.gentoo.org/proj/en/releng/catalyst'. +on the web at 'https://wiki.gentoo.org/wiki/Catalyst'. OPTIONS @@ -111,7 +111,7 @@ include::subarches.generated.txt[tabsize=4] BUGS ---- An up-to-date list of Catalyst bugs can always be found listed on the Gentoo -Linux bug-tracking system at 'http://bugs.gentoo.org'. +Linux bug-tracking system at 'https://bugs.gentoo.org'. NOTES @@ -140,4 +140,4 @@ SEE ALSO Also, a more in-depth examination of Catalyst options and procedures can be found linked from the *catalyst* project page, which is located at -'http://www.gentoo.org/proj/en/releng/catalyst'. +'https://wiki.gentoo.org/wiki/Catalyst'. diff --git a/examples/README b/examples/README index bfd517a..3450797 100644 --- a/examples/README +++ b/examples/README @@ -1,5 +1,5 @@ For further examples, see the releases/weekly/specs directory [1] in the releng Git repository [2]. -[1]: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=tree;f=releases/weekly/specs;hb=HEAD -[2]: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=summary +[1]: https://gitweb.gentoo.org/proj/releng.git/tree/releases/weekly/specs +[2]: https://gitweb.gentoo.org/proj/releng.git diff --git a/examples/generic_stage_template.spec b/examples/generic_stage_template.spec index b43aebe..367a182 100644 --- a/examples/generic_stage_template.spec +++ b/examples/generic_stage_template.spec @@ -2,7 +2,7 @@ # used to build a stage1, stage2, or stage3 installation tarball # The subarch can be any of the supported catalyst subarches (like athlon-xp). -# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/> +# Refer to "man catalyst" or <https://wiki.gentoo.org/wiki/Catalyst> # for supported subarches # example: # subarch: athlon-xp diff --git a/examples/grp_template.spec b/examples/grp_template.spec index c3d2c50..7116026 100644 --- a/examples/grp_template.spec +++ b/examples/grp_template.spec @@ -2,7 +2,7 @@ # used to build a GRP set # The subarch can be any of the supported catalyst subarches (like athlon-xp). -# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/> +# Refer to "man catalyst" or <https://wiki.gentoo.org/wiki/Catalyst> # for supported subarches # example: # subarch: athlon-xp diff --git a/examples/livecd-stage1_template.spec b/examples/livecd-stage1_template.spec index a3cd939..90ae199 100644 --- a/examples/livecd-stage1_template.spec +++ b/examples/livecd-stage1_template.spec @@ -2,7 +2,7 @@ # used to build a livecd-stage1 # The subarch can be any of the supported catalyst subarches (like athlon-xp). -# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/> +# Refer to "man catalyst" or <https://wiki.gentoo.org/wiki/Catalyst> # for supported subarches # example: # subarch: athlon-xp diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec index 49ddcd7..a90b7aa 100644 --- a/examples/livecd-stage2_template.spec +++ b/examples/livecd-stage2_template.spec @@ -2,7 +2,7 @@ # used to build a livecd-stage2 iso image # The subarch can be any of the supported catalyst subarches (like athlon-xp). -# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/> +# Refer to "man catalyst" or <https://wiki.gentoo.org/wiki/Catalyst> # for supported subarches # example: # subarch: athlon-xp diff --git a/examples/netboot_template.spec b/examples/netboot_template.spec index d10b645..0cffc66 100644 --- a/examples/netboot_template.spec +++ b/examples/netboot_template.spec @@ -2,7 +2,7 @@ # used to build a network bootable image # The subarch can be any of the supported catalyst subarches (like athlon-xp). -# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/> +# Refer to "man catalyst" or <https://wiki.gentoo.org/wiki/Catalyst> # for supported subarches # example: # subarch: athlon-xp diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec index c3a53d5..75aedff 100644 --- a/examples/stage4_template.spec +++ b/examples/stage4_template.spec @@ -2,7 +2,7 @@ # used to build a stage4 # The subarch can be any of the supported catalyst subarches (like athlon-xp). -# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/> +# Refer to "man catalyst" or <https://wiki.gentoo.org/wiki/Catalyst> # for supported subarches # example: # subarch: athlon-xp diff --git a/examples/tinderbox_template.spec b/examples/tinderbox_template.spec index db0dba2..f1af09c 100644 --- a/examples/tinderbox_template.spec +++ b/examples/tinderbox_template.spec @@ -1,7 +1,7 @@ # generic tinderbox specfile # The subarch can be any of the supported catalyst subarches (like athlon-xp). -# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/> +# Refer to "man catalyst" or <https://wiki.gentoo.org/wiki/Catalyst> # for supported subarches # example: # subarch: athlon-xp diff --git a/livecd/files/gamecd.motd.txt b/livecd/files/gamecd.motd.txt index 498490e..7ee2d9c 100644 --- a/livecd/files/gamecd.motd.txt +++ b/livecd/files/gamecd.motd.txt @@ -1,7 +1,7 @@ To (re)start ##GAME_NAME, please type "startx" at the prompt below. -Please report any bugs you find to http://bugs.gentoo.org. Be sure to include +Please report any bugs you find to https://bugs.gentoo.org. Be sure to include detailed information about how to reproduce the bug you are reporting. Thank you for using Gentoo Linux! diff --git a/livecd/files/livecd.motd.txt b/livecd/files/livecd.motd.txt index 0fb391e..fe4c091 100644 --- a/livecd/files/livecd.motd.txt +++ b/livecd/files/livecd.motd.txt @@ -3,7 +3,7 @@ There is also a rescue session for X using twm if you simply use "startx". You can start the installer by typing "installer" at the prompt below. -Please report any bugs you find to http://bugs.gentoo.org. Be sure to include +Please report any bugs you find to https://bugs.gentoo.org. Be sure to include detailed information about how to reproduce the bug you are reporting. Thank you for using Gentoo Linux! diff --git a/livecd/files/minimal.motd.txt b/livecd/files/minimal.motd.txt index 55f6158..3058b85 100644 --- a/livecd/files/minimal.motd.txt +++ b/livecd/files/minimal.motd.txt @@ -1,11 +1,11 @@ The latest version of the Handbook is always available from the Gentoo web -site by typing "links http://www.gentoo.org/doc/en/handbook/handbook.xml";. +site by typing "links https://wiki.gentoo.org/wiki/Handbook";. To start an ssh server on this system, type "/etc/init.d/sshd start". If you need to log in remotely as root, type "passwd root" to reset root's password to a known value. -Please report any bugs you find to http://bugs.gentoo.org. Be sure to include +Please report any bugs you find to https://bugs.gentoo.org. Be sure to include detailed information about how to reproduce the bug you are reporting. Thank you for using Gentoo Linux! diff --git a/setup.py b/setup.py index 3eb76d7..feca894 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def _posix_path(path): Distutils wants all paths to be written in the Unix convention (i.e. slash-separated) [1], so that's what we'll do here. - [1]: http://docs.python.org/2/distutils/setupscript.html#writing-the-setup-script + [1]: https://docs.python.org/2/distutils/setupscript.html """ if _os.path.sep != '/': return path.replace(_os.path.sep, '/') @@ -81,7 +81,7 @@ _setup( version=__version__, maintainer=_maintainer_name, maintainer_email=_maintainer_email, - url='http://www.gentoo.org/proj/en/releng/{0}/'.format(_package_name), + url='https://wiki.gentoo.org/wiki/Catalyst', download_url='http://distfiles.gentoo.org/distfiles/{0}-{1}.tar.bz2'.format( _package_name, __version__), license='GNU General Public License (GPL)', diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh index a96c567..5eef0d0 100755 --- a/targets/netboot/netboot-combine.sh +++ b/targets/netboot/netboot-combine.sh @@ -55,7 +55,7 @@ do # please use catalyst 1.1.5 or older #TEST TEST TEST TEST - #http://lists.debian.org/debian-alpha/2004/07/msg00094.html + #https://lists.debian.org/debian-alpha/2004/07/msg00094.html #make \ # -C /usr/src/linux \ # INITRD=/initrd.gz \ diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 327705f..2482651 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -92,7 +92,7 @@ setup_myfeatures(){ echo "${clst_distcc_hosts}" > /etc/distcc/hosts # This sets up automatic cross-distcc-fu according to - # http://www.gentoo.org/doc/en/cross-compiling-distcc.xml + # https://wiki.gentoo.org/wiki/Distcc/Cross-Compiling CHOST=$(portageq envvar CHOST) LIBDIR=$(get_libdir) cd /usr/${LIBDIR}/distcc/bin @@ -107,7 +107,7 @@ setup_myfeatures(){ clst_root_path=/ run_merge --oneshot --noreplace sys-devel/icecream || exit 1 # This sets up automatic cross-icecc-fu according to - # http://gentoo-wiki.com/HOWTO_Setup_An_ICECREAM_Compile_Cluster#Icecream_and_cross-compiling + # http://www.gentoo-wiki.info/HOWTO_Setup_An_ICECREAM_Compile_Cluster CHOST=$(portageq envvar CHOST) LIBDIR=$(get_libdir) cd /usr/${LIBDIR}/icecc/bin diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 12f8293..e10826d 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -87,7 +87,7 @@ ln -sf net.lo net.eth4 mkdir -p /etc/sysconfig # Tweak the livecd fstab so that users know not to edit it -# http://bugs.gentoo.org/show_bug.cgi?id=60887 +# https://bugs.gentoo.org/60887 echo "####################################################" > /etc/fstab echo "## ATTENTION: THIS IS THE FSTAB ON THE LIVECD ##" >> /etc/fstab echo "## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab ##" >> /etc/fstab @@ -104,7 +104,7 @@ then fi # Tweak the livecd make.conf so that users know not to edit it -# http://bugs.gentoo.org/show_bug.cgi?id=144647 +# https://bugs.gentoo.org/144647 mv ${clst_make_conf} ${clst_make_conf}.old echo "####################################################" >> ${clst_make_conf} echo "## ATTENTION: THIS IS THE MAKE.CONF ON THE LIVECD ##" >> ${clst_make_conf}
