6 İşlemeler 23a81af93f ... b7f2e5f3f6

Yazar SHA1 Mesaj Tarih
  Michael Schwarz b7f2e5f3f6 Merge branch 'stable' into experimental 2 yıl önce
  Michael Schwarz 44e28892b7 Correct interpreter 2 yıl önce
  Michael Schwarz c0f20e8649 Update modules file 2 yıl önce
  Michael Schwarz 75a2645456 Start new release 1.5.0 based on Upstream 2021.1.1 2 yıl önce
  Michael Schwarz 8f16a154ad Fix opkg path 2 yıl önce
  Michael Schwarz 3515d59025 Update to python3 2 yıl önce
4 değiştirilmiş dosya ile 7 ekleme ve 7 silme
  1. 1 1
      extra/template.conf
  2. 1 1
      modules
  3. 4 4
      scripts/gensites.py
  4. 1 1
      site.mk

+ 1 - 1
extra/template.conf

@@ -21,7 +21,7 @@
 	opkg = {
 		openwrt = 'http://firmware.srv.in.ffho.net/openwrt/packages-%v/%A',
 		extra = {
-			gluon = 'http://firmware.srv.in.ffho.net/%GR/modules/%S',
+			gluon = 'http://firmware.srv.in.ffho.net/%GR/packages/%S',
 		},
 	},
 

+ 1 - 1
modules

@@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=https://git.ffho.net/freifunkhochstift/ffho-packages.git
 PACKAGES_FFHO_BRANCH=master
-PACKAGES_FFHO_COMMIT=0cc6f952e9489bf0794b906f70285fef14bb56e3
+PACKAGES_FFHO_COMMIT=31b7d547abf57e27f15311b4d92146f2389b9e50

+ 4 - 4
scripts/gensites.py

@@ -1,14 +1,14 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 import os,sys
 
 if not 'GLUON_SITEDIR' in os.environ:
-    print "GLUON_SITEDIR not set"
+    print ("GLUON_SITEDIR not set")
     sys.exit(1)
 
-execfile(os.environ['GLUON_SITEDIR'] + "/extra/sites.conf")
-execfile(os.environ['GLUON_SITEDIR'] + "/extra/groups.conf")
+exec(open(os.environ['GLUON_SITEDIR'] + "/extra/sites.conf").read())
+exec(open(os.environ['GLUON_SITEDIR'] + "/extra/groups.conf").read())
 DOMAINS=os.environ['GLUON_SITEDIR'] + "/domains/"
 TEMPLATE = ""
 with open(os.environ['GLUON_SITEDIR'] + "/extra/template.conf") as f:

+ 1 - 1
site.mk

@@ -54,7 +54,7 @@ ifeq ($(GLUON_TARGET),x86-64)
 endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 1.4.1~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 1.5.0~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)