Thanks for this good work Zoltan, this is not any easy patch. On 11/04/2017 07:04 PM, Zoltan HERPAI wrote: > Given that we've decided to sail under the same flag for > the benefit of the whole community, and acknowledge the > achievements of the LEDE project, let's start the final > steps of the merge. > > The git and other sources are untouched until the infra merge. > > v2: - dismiss bugtracker and forum change > - update uhttpd cert gen > - update banner > - update busybox NSLOOKUP patch > > v3: - drop recipe in banner > - drop release name as per [1], update banner accordingly > - drop VERSION_NICK > > [1] http://lists.infradead.org/pipermail/lede-adm/2017-October/000636.html > > Signed-off-by: Zoltan HERPAI <wigy...@uid0.hu> > Signed-off-by: Imre Kaloz <ka...@openwrt.org>
In general this looks good to me. I think you should split up the parts changing URLs, so we can apply them when the URLs changed. One patch which changes of the main website link: http://www.openwrt.org One patch with the download mirror: - default "http://downloads.lede-project.org/snapshots"; + default "http://downloads.openwrt.org/snapshots"; ...... > diff --git a/include/version.mk b/include/version.mk > index 1a0d3c9..7fdb43b 100644 > --- a/include/version.mk > +++ b/include/version.mk > @@ -10,13 +10,10 @@ > # REVISION:=x > # SOURCE_DATE_EPOCH:=x > > -RELEASE:=Reboot > - > PKG_CONFIG_DEPENDS += \ > CONFIG_VERSION_BUG_URL \ > CONFIG_VERSION_NUMBER \ > CONFIG_VERSION_CODE \ > - CONFIG_VERSION_NICK \ > CONFIG_VERSION_REPO \ > CONFIG_VERSION_DIST \ > CONFIG_VERSION_MANUFACTURER \ > @@ -36,21 +33,18 @@ VERSION_NUMBER:=$(if > $(VERSION_NUMBER),$(VERSION_NUMBER),SNAPSHOT) > VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE)) > VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) > > -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.lede-project.org/snapshots) > +VERSION_REPO:=$(if > $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots) > > VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST)) > -VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),LEDE) > +VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt) > VERSION_DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST)) > > VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER)) > -VERSION_MANUFACTURER:=$(if > $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),LEDE) > +VERSION_MANUFACTURER:=$(if > $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),OpenWrt) > > VERSION_MANUFACTURER_URL:=$(call > qstrip_escape,$(CONFIG_VERSION_MANUFACTURER_URL)) > -VERSION_MANUFACTURER_URL:=$(if > $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://lede-project.org/) > +VERSION_MANUFACTURER_URL:=$(if > $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://openwrt.org/) > > VERSION_BUG_URL:=$(call qstrip_escape,$(CONFIG_VERSION_BUG_URL)) > VERSION_BUG_URL:=$(if > $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.lede-project.org/) > @@ -93,8 +87,6 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \ > -e 's,%v,\L$(subst $(space),_,$(VERSION_NUMBER)),g' \ > -e 's,%C,$(VERSION_CODE),g' \ > -e 's,%c,\L$(subst $(space),_,$(VERSION_CODE)),g' \ > - -e 's,%N,$(VERSION_NICK),g' \ > - -e 's,%n,\L$(subst $(space),_,$(VERSION_NICK)),g' \ > -e 's,%D,$(VERSION_DIST),g' \ > -e 's,%d,\L$(subst $(space),_,$(VERSION_DIST)),g' \ > -e 's,%R,$(REVISION),g' \ Should we remove the nick or set it to an empty string? I do not really care. .......... > diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk > index f22b8ad..830bba6 100644 > --- a/toolchain/gcc/common.mk > +++ b/toolchain/gcc/common.mk > @@ -53,8 +53,8 @@ endif > > PATCH_DIR=../patches/$(GCC_VERSION) > > -BUGURL=http://www.lede-project.org/bugs/ > -PKGVERSION=LEDE GCC $(PKG_VERSION) $(REVISION) > +BUGURL=http://www.openwrt.org/bugs/ > +PKGVERSION=OpenWrt GCC $(PKG_VERSION) $(REVISION) Please use a seperate patch for this, this is pointing to a LEDE wiki page. Hauke _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
