Update libreCMC final repsitory and version information.

diff --git a/trunk/include/version.mk b/trunk/include/version.mk
index 47b02d0c25d09f8c95f498eb77f0f504644b3dda..2278a3b68f9bb5e0102bafa06bdf58c1034e38b2 100644 (file)
--- a/trunk/include/version.mk
+++ b/trunk/include/version.mk
@@ -22,16 +22,16 @@ qstrip_escape=$(subst ','\'',$(call qstrip,$(1)))
 #'
 
 VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),$(REVISION))
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),v1.3.4)
 
 VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),Frivolous Fred)
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),Elegant Eleanor)
 
 VERSION_NICK:=$(call qstrip_escape,$(CONFIG_VERSION_NICK))
 VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE))
 
 VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.librecmc.org/snapshots/trunk/%S/packages)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://librecmc.org/downloads/snapshots/%v/%S/packages)
 
 VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),libreCMC)

diff --git a/trunk/package/base-files/image-config.in b/trunk/package/base-files/image-config.in
index d5c22f911163c51375d79eeea3865bd38b4cd47c..cfa5d34f83300f096fa1939296d2a29a04d5aaee 100644 (file)
--- a/trunk/package/base-files/image-config.in
+++ b/trunk/package/base-files/image-config.in
@@ -76,7 +76,7 @@ config TARGET_PREINIT_IFNAME
 config TARGET_PREINIT_IP
        string
        prompt "IP address for preinit network messages" if PREINITOPT
-       default "192.168.1.1"
+       default "192.168.10.1"
        help
                IP address used to configure interface for preinit network
                messages, including failsafe messages
@@ -92,7 +92,7 @@ config TARGET_PREINIT_NETMASK
 config TARGET_PREINIT_BROADCAST
        string
        prompt "Broadcast address for preinit network messages" if PREINITOPT
-       default "192.168.1.255"
+       default "192.168.10.255"
        help
                Broadcast address to which to send preinit network messages, as
                as failsafe messages
@@ -166,6 +166,7 @@ if VERSIONOPT
        config VERSION_NICK
                string
                prompt "Release version nickname"
+               default "Elegant Eleanor"
                help
                        This is the release codename embedded in the image.
                        If unspecified, it defaults to the name of source branch.
@@ -173,6 +174,7 @@ if VERSIONOPT
        config VERSION_NUMBER
                string
                prompt "Release version number"
+               default "v1.3.4"
                help
                        This is the release version number embedded in the image.
                        If unspecified, it defaults to the svn or git-svn revision
@@ -181,7 +183,7 @@ if VERSIONOPT
        config VERSION_REPO
                string
                prompt "Release repository"
-               default "http://downloads.librecmc.org/snapshots/trunk/%S/packages"
+               default "https://librecmc.org/downloads/snapshots/%v/%S/packages"
                help
                        This is the repository address embedded in the image, it defaults
                        to the trunk snapshot repo; the url may contain the following placeholders:

diff --git a/trunk/scripts/download.pl b/trunk/scripts/download.pl
index 2b30a0ed02900f2deaf66f2c7295b295f7e4ac15..70b63ac2db7870350ac1c8d024517992f5db63fc 100755 (executable)
--- a/trunk/scripts/download.pl
+++ b/trunk/scripts/download.pl
@@ -223,7 +223,6 @@ foreach my $mirror (@ARGV) {
 }
 
 push @mirrors, 'https://librecmc.org/librecmc/downloads/sources';
-push @mirrors, 'http://downloads.openwrt.org/sources';
 
 
 while (!$ok) {