Verified Commit 3904d9d2 authored by Karel Koci's avatar Karel Koci 🤘
Browse files

Merge branch 'hotfix/gitlab-url' into develop

parents 037f25a2 7763b35c
#!/bin/bash
repo="https://gitlab.nic.cz/turris/turris-os-packages"
repo="https://gitlab.nic.cz/turris/os/packages"
cur_branch="$(git branch --show-current)"
......
......@@ -7,4 +7,4 @@ To understand what are files in this repository you can read appropriate
https://openwrt.org/docs/guide-developer/packages[OpenWrt documentation].
If you are looking for Turris OS itself see
https://gitlab.labs.nic.cz/turris/turris-build[turris-build] repository.
https://gitlab.nic.cz/turris/os/build[turris-build] repository.
......@@ -2,7 +2,7 @@ Turris OS packages repository workflow
======================================
Before you start reading please be sure that you have read and understood workflow
for https://gitlab.labs.nic.cz/turris/turris-build/blob/hbk/WORKFLOW.adoc[turris-build].
for https://gitlab.nic.cz/turris/os/build/blob/hbk/WORKFLOW.adoc[turris-build].
This workflow is referencing it as this repository is used as part of release
cycle of that one.
......
......@@ -28,7 +28,7 @@ define Package/sentinel-nikola
CATEGORY:=Collect
SUBMENU:=Sentinel
TITLE:=Nikola
URL:=https://gitlab.labs.nic.cz/turris/sentinel/nikola
URL:=https://gitlab.nic.cz/turris/sentinel/nikola
DEPENDS:= \
+python3-light \
+python3-setuptools \
......
......@@ -12,7 +12,7 @@ PKG_VERSION:=0.1
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/mox-pkcs11.git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/mox-pkcs11.git
PKG_MIRROR_HASH:=4e001de00cdd58c666815894cd79fbc905d70a3555bb84c549703fa611c7c96b
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
......
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=switch-branch
PKG_VERSION:=2.6.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
......
......@@ -419,7 +419,7 @@ print_kitten() {
You are now tracking branch containing software build every night. It often contains bugs and sometimes requires manual intervention!
It is based on latest stable OpenWrt branch with Turris OS changes.
Turris team provides no guarantees and no support for this branch. You can get some help on forum (https://forum.turris.cz/).
If you encounter some bugs than please debug cause and report it to developers trough gitlab (https://gitlab.labs.nic.cz/turris/),
If you encounter some bugs than please debug cause and report it to developers trough gitlab (https://gitlab.nic.cz/turris/),
You shouldn't be in this branch unless you are advanced user!
To return to stable branch run this command: switch-branch hbs
EOF
......@@ -443,7 +443,7 @@ print_lion() {
You are now tracking branch containing software build every night. It often contains bugs and sometimes requires manual intervention!
It is based on latest stable OpenWrt branch with latest Turris OS changes.
Turris team provides no guarantees and no support for this branch. You can get some help on forum (https://forum.turris.cz/).
If you encounter some bugs than please debug cause and report it to developers trough gitlab (https://gitlab.labs.nic.cz/turris/),
If you encounter some bugs than please debug cause and report it to developers trough gitlab (https://gitlab.nic.cz/turris/),
You shouldn't be in this branch unless you are advanced user!
To return to stable branch run this command: switch-branch hbs
EOF
......@@ -466,7 +466,7 @@ print_dragon() {
You are now tracking branch containing software build every night. It often contains bugs and very often requires manual intervention!
It is based on latest OpenWrt development branch with latest Turris OS changes.
Turris team provides no guarantees and no support for this branch. You can get some help on forum (https://forum.turris.cz/).
If you encounter some bugs than please debug cause and report it to developers trough gitlab (https://gitlab.labs.nic.cz/turris/),
If you encounter some bugs than please debug cause and report it to developers trough gitlab (https://gitlab.nic.cz/turris/),
You shouldn't be in this branch unless you are advanced user and OpenWrt developer!
To return to stable branch run this command: switch-branch hbs
EOF
......
......@@ -12,7 +12,7 @@ PKG_VERSION:=0.3.0
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/reforis/reforis-netmetr
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/reforis/reforis-netmetr
PKG_MIRROR_HASH:=bfea675c7e91a55d1e2afcf9a92392f9f122cc4ccfbb0766725b0b708f78092e
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
......@@ -34,7 +34,7 @@ define Package/reforis-netmetr-plugin
CATEGORY:=Web
SUBMENU:=reForis
TITLE:=reForis NetMetr plugin
URL:=https://gitlab.labs.nic.cz/turris/reforis/reforis-netmetr
URL:=https://gitlab.nic.cz/turris/reforis/reforis-netmetr
DEPENDS:=\
+reforis \
+foris-controller-netmetr-module
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment