From 43449bcbbda0582a820acf9f8e2ac20e4ec28137 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Thu, 12 Jul 2018 16:50:47 +0200 Subject: [PATCH] treewide: Basic cleanup and alignment to package guidelines (#383) This is a very basic cleanup, several packages needs more work but this at least drops git for https and removes the use of PKG_MD5SUM and some minor fixes. Signed-off-by: Daniel Engberg --- babel-pinger/Makefile | 2 +- babeld/Makefile | 1 - batmand/Makefile | 2 +- bird2/Makefile | 2 +- bmx6/Makefile | 4 +--- bmx7/Makefile | 3 +-- mcproxy/Makefile | 2 +- minimalist-pcproxy/Makefile | 2 +- mrd6/Makefile | 2 +- nodogsplash/Makefile | 2 +- ohybridproxy/Makefile | 2 +- olsrd/Makefile | 1 - quagga/Makefile | 4 ++-- vis/Makefile | 2 +- 14 files changed, 13 insertions(+), 18 deletions(-) diff --git a/babel-pinger/Makefile b/babel-pinger/Makefile index 40e7b1a..052f467 100644 --- a/babel-pinger/Makefile +++ b/babel-pinger/Makefile @@ -10,7 +10,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/ -PKG_MD5SUM:=40d4931986913f5f8d9b5b70abf6fda5 +PKG_HASH:=c411430bb102f08d3d68d2fb5010b5da0149908b671ac0fb12abd8c8ee6380c5 include $(INCLUDE_DIR)/package.mk diff --git a/babeld/Makefile b/babeld/Makefile index 5cf136d..f4c65c9 100644 --- a/babeld/Makefile +++ b/babeld/Makefile @@ -13,7 +13,6 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.irif.fr/~jch/software/files/ -PKG_MD5SUM:=eec395ade02524b3f351507a21742939 PKG_HASH:=07edecb132386d5561a767482bc5200e04239b18e48c2f0f47ae1c78d60fe5dc PKG_LICENSE:=MIT diff --git a/batmand/Makefile b/batmand/Makefile index b4ed301..425d355 100644 --- a/batmand/Makefile +++ b/batmand/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=batmand PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://git.open-mesh.org/batmand.git +PKG_SOURCE_URL:=https://git.open-mesh.org/batmand.git PKG_REV:=b67a7087b51d7a5e90d27ac39116d1f57257c86e PKG_VERSION:=1440 PKG_RELEASE:=0 diff --git a/bird2/Makefile b/bird2/Makefile index 47ca580..f4aa4cd 100644 --- a/bird2/Makefile +++ b/bird2/Makefile @@ -12,7 +12,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird -PKG_MD5SUM:=035f91d6f568f8ed438a0814235ac4c5c79147cd2acf201322c307732883480f +PKG_HASH:=035f91d6f568f8ed438a0814235ac4c5c79147cd2acf201322c307732883480f PKG_BUILD_DEPENDS:=ncurses readline PKG_MAINTAINER:=Toke Høiland-Jørgensen PKG_BUILD_DIR:=$(BUILD_DIR)/bird-$(PKG_VERSION) diff --git a/bmx6/Makefile b/bmx6/Makefile index fd96081..92610e1 100644 --- a/bmx6/Makefile +++ b/bmx6/Makefile @@ -28,8 +28,7 @@ PKG_NAME:=bmx6 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://github.com/bmx-routing/bmx6.git -#PKG_SOURCE_URL:=file:///usr/src/bmx-routing/bmx6.git +PKG_SOURCE_URL:=https://github.com/bmx-routing/bmx6.git PKG_REV:=0312168aaa384379ccbefd4b2d936fc698664d5b PKG_MIRROR_HASH:=98acdbda8a8cadadf8141c7b8a17b6417112f70f3211b86abad23a8c7a28be10 @@ -44,7 +43,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) include $(INCLUDE_DIR)/package.mk - TARGET_CFLAGS += $(FPIC) MAKE_ARGS += \ diff --git a/bmx7/Makefile b/bmx7/Makefile index b1575ce..fe90af9 100644 --- a/bmx7/Makefile +++ b/bmx7/Makefile @@ -27,8 +27,7 @@ PKG_NAME:=bmx7 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://github.com/bmx-routing/bmx7.git -#PKG_SOURCE_URL:=file:///usr/src/bmx-routing/bmx7.git +PKG_SOURCE_URL:=https://github.com/bmx-routing/bmx7.git PKG_REV:=9883383dc26df16da67b9ef7ba99efe62f79c4e7 PKG_MIRROR_HASH:=012178aba42016d3e0961715f99bf1e322c2c6c22b1cc6635375468360cb4d68 diff --git a/mcproxy/Makefile b/mcproxy/Makefile index 4b6cf4e..ca709c8 100644 --- a/mcproxy/Makefile +++ b/mcproxy/Makefile @@ -13,7 +13,7 @@ PKG_VERSION:=2017-08-24-$(PKG_SOURCE_VERSION) PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://github.com/mcproxy/mcproxy.git +PKG_SOURCE_URL:=https://github.com/mcproxy/mcproxy.git PKG_MAINTAINER:=Steven Barth PKG_LICENSE:=GPL-2.0+ diff --git a/minimalist-pcproxy/Makefile b/minimalist-pcproxy/Makefile index 36faa8d..8b8cf24 100644 --- a/minimalist-pcproxy/Makefile +++ b/minimalist-pcproxy/Makefile @@ -12,7 +12,7 @@ PKG_VERSION:=2015-01-12-$(PKG_SOURCE_VERSION) PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://github.com/fingon/minimalist-pcproxy.git +PKG_SOURCE_URL:=https://github.com/fingon/minimalist-pcproxy.git PKG_MAINTAINER:=Markus Stenberg PKG_LICENSE:=GPL-2.0 diff --git a/mrd6/Makefile b/mrd6/Makefile index c4863ed..8cdd8d1 100644 --- a/mrd6/Makefile +++ b/mrd6/Makefile @@ -13,7 +13,7 @@ PKG_VERSION:=2013-11-30-$(PKG_SOURCE_VERSION) PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://github.com/hugosantos/mrd6.git +PKG_SOURCE_URL:=https://github.com/hugosantos/mrd6.git PKG_MAINTAINER:=Steven Barth PKG_LICENSE:=GPL-2.0+ diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile index b0f9da8..7b05e63 100644 --- a/nodogsplash/Makefile +++ b/nodogsplash/Makefile @@ -12,7 +12,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=git://github.com/nodogsplash/nodogsplash.git +PKG_SOURCE_URL:=https://github.com/nodogsplash/nodogsplash.git PKG_SOURCE_VERSION:=9ef7d5fc16351585baf65877776d19cf85bf3031 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_PARALLEL:=1 diff --git a/ohybridproxy/Makefile b/ohybridproxy/Makefile index 7d88f5d..ea23137 100644 --- a/ohybridproxy/Makefile +++ b/ohybridproxy/Makefile @@ -12,7 +12,7 @@ PKG_VERSION:=2016-06-28-$(PKG_SOURCE_VERSION) PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://github.com/sbyx/ohybridproxy.git +PKG_SOURCE_URL:=https://github.com/sbyx/ohybridproxy.git PKG_MAINTAINER:=Steven Barth PKG_LICENSE:=GPL-2.0 diff --git a/olsrd/Makefile b/olsrd/Makefile index 4aaccb2..75f377e 100644 --- a/olsrd/Makefile +++ b/olsrd/Makefile @@ -16,7 +16,6 @@ PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=v0.9.6.2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_MD5SUM:= PKG_BUILD_PARALLEL:=0 PKG_LICENSE:=BSD-3-Clause diff --git a/quagga/Makefile b/quagga/Makefile index f8963e0..e2751f4 100644 --- a/quagga/Makefile +++ b/quagga/Makefile @@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=quagga PKG_VERSION:=1.1.0 PKG_RELEASE:=1 -PKG_MD5SUM:=daa303871e07ea5856aae6fd79e89722 +PKG_HASH:=f7a43a9c59bfd3722002210530b2553c8d5cc05bfea5acd56d4f102b9f55dc63 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/quagga/ +PKG_SOURCE_URL:=@SAVANNAH/quagga/ PKG_CONFIG_DEPENDS:= \ CONFIG_IPV6 \ CONFIG_PACKAGE_quagga-watchquagga \ diff --git a/vis/Makefile b/vis/Makefile index 316224a..af58f5e 100644 --- a/vis/Makefile +++ b/vis/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vis PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://git.open-mesh.org/vis.git +PKG_SOURCE_URL:=https://git.open-mesh.org/vis.git PKG_REV:=e141311c6a4fc824efbad536c137ed279905d825 PKG_VERSION:=1440 PKG_RELEASE:=0 -- 2.30.2