From c960f3ef6f4d3d7bf4f2a81dd0d5b4609ba10def Mon Sep 17 00:00:00 2001
From: Martyn Welch <martyn.welch@collabora.com>
Date: Thu, 29 Apr 2021 19:20:59 +0100
Subject: [PATCH] Update package URLs to match current locations
The packages have been moved from repository based subdirectories under
`pkg/` to `pkg/` its self. Update the URLs used on the website to reflect
this.
Signed-off-by: Martyn Welch <martyn.welch@collabora.com>
---
content/architecture/apis-and-services.md | 4 ++--
content/architecture/secure-boot.md | 6 +++---
content/architecture/versioning.md | 2 +-
content/guides/apertis_release_process.md | 12 ++++++------
...ildingpatchingandmaintainingtheapertiskernel.md | 4 ++--
content/policies/hardware_enablement.md | 4 ++--
content/policies/hwpack-requirements.md | 6 +++---
content/policies/license-applying.md | 2 +-
content/release/v2019.2/releasenotes.md | 6 +++---
content/release/v2021.0/releasenotes.md | 2 +-
content/release/v2021dev3/releasenotes.md | 14 +++++++-------
11 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/content/architecture/apis-and-services.md b/content/architecture/apis-and-services.md
index 538bad1c7..0073eb60a 100644
--- a/content/architecture/apis-and-services.md
+++ b/content/architecture/apis-and-services.md
@@ -262,7 +262,7 @@ system to provide the basic UI even if there are no user focused applications:
| Purpose | API Documentation | Git repository |
|---------|-------------------|----------------|
- | Logging library | TBD | <https://gitlab.apertis.org/pkg/target/libclapton> |
+ | Logging library | TBD | <https://gitlab.apertis.org/pkg/libclapton> |
- **Ribchester**: The service responsible for managing the application and
@@ -270,7 +270,7 @@ system to provide the basic UI even if there are no user focused applications:
| Purpose | API Documentation | Git repository |
|---------|-------------------|----------------|
- | Application installer/mounting service | [Ribchester API](https://docs.apertis.org/ribchester/ribchester/) | <https://gitlab.apertis.org/pkg/target/ribchester> |
+ | Application installer/mounting service | [Ribchester API](https://docs.apertis.org/ribchester/ribchester/) | <https://gitlab.apertis.org/pkg/ribchester> |
- **Rhosydd/Croesor**: Rhosydd and Croesor are system services for handling
access to sensors and actuators from applications. It provides a
diff --git a/content/architecture/secure-boot.md b/content/architecture/secure-boot.md
index b2484a846..a8e05ad78 100644
--- a/content/architecture/secure-boot.md
+++ b/content/architecture/secure-boot.md
@@ -245,9 +245,9 @@ The [good introduction into HAB (High Assurance Boot)](https://boundarydevices.c
is prepared by Boundary Devices, also there are some [documentation](https://github.com/u-boot/u-boot/blob/master/doc/imx/habv4/introduction_habv4.txt)
and examples in U-Boot source tree.
-The [NXP Code Signing Tool](https://gitlab.apertis.org/pkg/development/imx-code-signing-tool)
+The [NXP Code Signing Tool](https://gitlab.apertis.org/pkg/imx-code-signing-tool)
is needed to create keys, certificates and SRK hashes used during the signing
-process -- please refer to [section 3.1.3 of CST User's Guide](https://gitlab.apertis.org/pkg/development/imx-code-signing-tool/-/blob/apertis/v2021dev2/docs/CST_UG.pdf).
+process -- please refer to [section 3.1.3 of CST User's Guide](https://gitlab.apertis.org/pkg/imx-code-signing-tool/-/blob/apertis/v2021dev2/docs/CST_UG.pdf).
Apertis reference images use the [public git repository](https://gitlab.apertis.org/infrastructure/apertis-imx-srk)
with all secrets available, so it could be used for signing binaries during
development in case if board has been fused with Apertis SRK hash (**irreversible operation!!!**).
@@ -349,7 +349,7 @@ format since it allows to embed Linux kernel, initramfs and DTB into a single im
Hence the support of FIT images must be enabled in U-Boot configuration by
option `CONFIG_FIT`.
-The [patch series](https://gitlab.apertis.org/pkg/target/u-boot/-/merge_requests/4)
+The [patch series](https://gitlab.apertis.org/pkg/u-boot/-/merge_requests/4)
enables verification of FIT image prior to execution of the Linux kernel. Patched U-Boot
do verification of the whole FIT binary prior to extraction kernel and initramfs images,
and this ensures that only verified initial system will be started.
diff --git a/content/architecture/versioning.md b/content/architecture/versioning.md
index 1836efc7f..3b1865571 100644
--- a/content/architecture/versioning.md
+++ b/content/architecture/versioning.md
@@ -171,7 +171,7 @@ post-release increment for package versions to ensure that the package version
number is not outdated (i.e. still equal to the previous release) during the
development cycle; we achieve this by altering the version number automatically
in
-[the build-snapshot script](https://gitlab.apertis.org/pkg/target/apertis-customizations/blob/apertis/v2020dev0/development/build-snapshot)
+[the build-snapshot script](https://gitlab.apertis.org/pkg/apertis-customizations/blob/apertis/v2020dev0/development/build-snapshot)
instead.
## Package Versioning
diff --git a/content/guides/apertis_release_process.md b/content/guides/apertis_release_process.md
index 8209e59fe..c2ab117f3 100644
--- a/content/guides/apertis_release_process.md
+++ b/content/guides/apertis_release_process.md
@@ -133,7 +133,7 @@ Host images.apertis.org
* Update the [gitlab-rulez](https://gitlab.apertis.org/infrastructure/gitlab-rulez/) recipe to point to the new development release
* Set the default development branch for all git projects
* Set the protection settings onto all `apertis/*` branches, which were unprotected in the initial release steps
-* Manually branch the [base-files](https://gitlab.apertis.org/pkg/target/base-files/) package, after the new docker images have been built.
+* Manually branch the [base-files](https://gitlab.apertis.org/pkg/base-files/) package, after the new docker images have been built.
* This step should automatically update the release specific attributes in the new package and auto propose the changes through a new merge request
## Build Suffix
@@ -240,19 +240,19 @@ The `apply` sub-command does the actual job.
Running in apply mode
Package apt is NOT IN SYNC in branches: v2020 and v2020-security
Merging branch v2020-security into v2020
- https://gitlab.apertis.org/pkg/target/apt/-/merge_requests/10
+ https://gitlab.apertis.org/pkg/apt/-/merge_requests/10
Package bluez is NOT IN SYNC in branches: v2020 and v2020-security
Merging branch v2020-security into v2020
- https://gitlab.apertis.org/pkg/target/bluez/-/merge_requests/12
+ https://gitlab.apertis.org/pkg/bluez/-/merge_requests/12
Package boost1.67 is NOT IN SYNC in branches: v2020 and v2020-security
Merging branch v2020-security into v2020
- https://gitlab.apertis.org/pkg/target/boost1.67/-/merge_requests/5
+ https://gitlab.apertis.org/pkg/boost1.67/-/merge_requests/5
Package cups is NOT IN SYNC in branches: v2020 and v2020-security
Merging branch v2020-security into v2020
- https://gitlab.apertis.org/pkg/target/cups/-/merge_requests/8
+ https://gitlab.apertis.org/pkg/cups/-/merge_requests/8
Package curl is NOT IN SYNC in branches: v2020 and v2020-security
Merging branch v2020-security into v2020
- https://gitlab.apertis.org/pkg/target/curl/-/merge_requests/7
+ https://gitlab.apertis.org/pkg/curl/-/merge_requests/7
Package cyrus-sasl2 is NOT IN SYNC in branches: v2020 and v2020-security
Merging branch v2020-security into v2020
diff --git a/content/guides/buildingpatchingandmaintainingtheapertiskernel.md b/content/guides/buildingpatchingandmaintainingtheapertiskernel.md
index e12451e8a..828f367e5 100644
--- a/content/guides/buildingpatchingandmaintainingtheapertiskernel.md
+++ b/content/guides/buildingpatchingandmaintainingtheapertiskernel.md
@@ -46,11 +46,11 @@ starting point for our modifications. As with most Debian packages, the
upstream source is stored separately from any distribution specific
modifications, scripting and metadata. In the case of the Apertis
kernel, all the required components are stored in a [single git
-repository](https://gitlab.apertis.org/pkg/target/linux), however on
+repository](https://gitlab.apertis.org/pkg/linux), however on
different branches. To retrieve the git repository run the following git
command:
- $ git clone https://gitlab.apertis.org/pkg/target/linux
+ $ git clone https://gitlab.apertis.org/pkg/linux
$ cd linux
Ensure that you have the branch you're interested in checked out (in
diff --git a/content/policies/hardware_enablement.md b/content/policies/hardware_enablement.md
index e5f735ba3..86c6b0938 100644
--- a/content/policies/hardware_enablement.md
+++ b/content/policies/hardware_enablement.md
@@ -59,7 +59,7 @@ two bootloaders:
- U-Boot: Typically used on ARM. Hardware support should be integrated
in the U-Boot version used by the [version of Apertis being
- used](https://gitlab.apertis.org/pkg/target/u-boot) or newer.
+ used](https://gitlab.apertis.org/pkg/u-boot) or newer.
<!-- end list -->
@@ -75,7 +75,7 @@ that any hardware enablement done for Apertis is also upstream, to both
minimize the delta with upstream and make it easier to update to newer
versions. The specific version of the Linux kernel currently being
targetted by the Apertis release being used can be determined for the
-[Apertis kernel](https://gitlab.apertis.org/pkg/target/linux) git
+[Apertis kernel](https://gitlab.apertis.org/pkg/linux) git
repository.
### Specific Kernel Areas
diff --git a/content/policies/hwpack-requirements.md b/content/policies/hwpack-requirements.md
index 4651a1982..ac5e0885e 100644
--- a/content/policies/hwpack-requirements.md
+++ b/content/policies/hwpack-requirements.md
@@ -79,7 +79,7 @@ As with the OSpack (and unless specific exceptions provided) all components shou
## Bootloader
-Apertis standardizes on the U-Boot as the bootloader on all non-x86 platforms. In order to support the standard Apertis boot, update and rollback functionality it is necessary for the configuration to include the "[Generic Distro Configuration Concept](https://gitlab.apertis.org/pkg/target/u-boot/blob/apertis/v2020pre/doc/README.distro)" (often referred to as "Distro Boot"). The configuration used by this mechanism has been tweaked to work with Apertis rollback mechanisms.
+Apertis standardizes on the U-Boot as the bootloader on all non-x86 platforms. In order to support the standard Apertis boot, update and rollback functionality it is necessary for the configuration to include the "[Generic Distro Configuration Concept](https://gitlab.apertis.org/pkg/u-boot/blob/apertis/v2020pre/doc/README.distro)" (often referred to as "Distro Boot"). The configuration used by this mechanism has been tweaked to work with Apertis rollback mechanisms.
In order to enable efficient development, it would be advisable to ensure that access to the boot prompt is enabled along with networking support and the PXE and DHCP boot options where applicable. (Note: U-Boot can supports networking via a USB RNDIS gadget should a USB On-The-Go (USB OTG) port be available.)
@@ -89,7 +89,7 @@ Apertis expects projects that using it have a need to take product security seri
It is understood that in some circumstances it may be necessary to utilize a heavily modified "vendor kernel". Please note that these kernels are typically not provided with any form of long-term support and thus may quickly lack important security and stability fixes. Unless otherwise agreed, the burden of supporting such kernels will remain with the product team. Likewise, in addition to lacking a source of security fixes, many older kernels are known to have serious vulnerabilities that can only be fully resolved/mitigated by updating to a newer kernel. Apertis strongly discourages the use of such kernels.
-The Apertis kernel contains a number of modifications primarily to enhance the Apparmor support provided by the upstream kernel. The patches used by the stock Apertis kernel can be found in the Apertis [GitLab](https://gitlab.apertis.org/pkg/target/linux/tree/apertis/v2020pre/debian/patches/apparmor). In order to support Apertis' use of Apparmor, a kernel needs to support the following Apparmor mediations:
+The Apertis kernel contains a number of modifications primarily to enhance the Apparmor support provided by the upstream kernel. The patches used by the stock Apertis kernel can be found in the Apertis [GitLab](https://gitlab.apertis.org/pkg/linux/tree/apertis/v2020pre/debian/patches/apparmor). In order to support Apertis' use of Apparmor, a kernel needs to support the following Apparmor mediations:
- file
- ptrace
@@ -101,7 +101,7 @@ The Apertis kernel contains a number of modifications primarily to enhance the A
- umount
- namespaces
-Additionally, the kernel should be configured to support the [functionality required by systemd](https://gitlab.apertis.org/pkg/target/systemd/blob/apertis/v2020pre/README).
+Additionally, the kernel should be configured to support the [functionality required by systemd](https://gitlab.apertis.org/pkg/systemd/blob/apertis/v2020pre/README).
For development purposes, the kernel should provide early serial debugging and be capable of booting from an NFS rootfs.
diff --git a/content/policies/license-applying.md b/content/policies/license-applying.md
index 2b9fe9c05..4fc36f337 100644
--- a/content/policies/license-applying.md
+++ b/content/policies/license-applying.md
@@ -63,7 +63,7 @@ which lives in the top directory in the git repository for the project. This
file will contain the full license text, as
[provided by Mozilla](https://www.mozilla.org/media/MPL/2.0/index.815ca599c9df.txt),
without any modifications or changes. For example, see the
-[newport COPYING file](https://gitlab.apertis.org/pkg/target/newport/blob/apertis/v2019/COPYING).
+[newport COPYING file](https://gitlab.apertis.org/pkg/newport/blob/apertis/v2019/COPYING).
While `COPYING` is a more common filename to use, `COPYING.MPL` accounts for
the case where there may be files in the project under a different license
diff --git a/content/release/v2019.2/releasenotes.md b/content/release/v2019.2/releasenotes.md
index 347de1d3b..8c1706112 100644
--- a/content/release/v2019.2/releasenotes.md
+++ b/content/release/v2019.2/releasenotes.md
@@ -72,13 +72,13 @@ This release includes:
- the security updates from Debian Buster
- a fix for the `bluez` package resolving a [conflict with its
- AppArmor profile](https://gitlab.apertis.org/pkg/target/bluez/commits/apertis/5.50-1co3)
+ AppArmor profile](https://gitlab.apertis.org/pkg/bluez/commits/apertis/5.50-1co3)
- the removal of the dependency on the `libquvi` package from
`totem-pl-parser` due to GPL-3 licensing issues
- the AppArmor profile for the `tracker` package has been [moved to the
- package itself](https://gitlab.apertis.org/pkg/target/tracker/commits/apertis/2.8.1-2co1),
+ package itself](https://gitlab.apertis.org/pkg/tracker/commits/apertis/2.8.1-2co1),
rather than in the `chaiwala-apparmor-profiles` package
- - the [switch to the ICU backend](https://gitlab.apertis.org/pkg/target/tracker/commits/apertis/2.8.1-2co4)
+ - the [switch to the ICU backend](https://gitlab.apertis.org/pkg/tracker/commits/apertis/2.8.1-2co4)
in the `tracker` package to avoid GPL-3 issues with `libunistring`
## Deprecations and ABI/API breaks
diff --git a/content/release/v2021.0/releasenotes.md b/content/release/v2021.0/releasenotes.md
index 3a0dfdddc..995b61f70 100644
--- a/content/release/v2021.0/releasenotes.md
+++ b/content/release/v2021.0/releasenotes.md
@@ -94,7 +94,7 @@ and [v2021dev3]({{< ref "release/v2021dev3/releasenotes.md" >}}).
### New Rhosydd data model and API based on the W3C VISS specification
-[Rhosydd](https://gitlab.apertis.org/pkg/target/rhosydd/), the vehicle device
+[Rhosydd](https://gitlab.apertis.org/pkg/rhosydd/), the vehicle device
daemon implementing the
[sensors and actuators API]( {{< ref "sensors-and-actuators.md" >}} )
has been rebased to the data model from the latest W3C specification, as
diff --git a/content/release/v2021dev3/releasenotes.md b/content/release/v2021dev3/releasenotes.md
index 186f9c76c..079020d9e 100644
--- a/content/release/v2021dev3/releasenotes.md
+++ b/content/release/v2021dev3/releasenotes.md
@@ -107,7 +107,7 @@ describing the new [Application Framework]( {{< ref "application-framework.md" >
### Moved both Renesas R-Car and SABRE Lite to newer U-Boot
The Raspberry Pi support required the introduction of a
-[new U-Boot version](https://gitlab.apertis.org/pkg/target/u-boot/-/merge_requests/25)
+[new U-Boot version](https://gitlab.apertis.org/pkg/u-boot/-/merge_requests/25)
from Debian Bullseye, version `2020.04`.
The Apertis team took this chance to also streamline the support for the other
@@ -118,16 +118,16 @@ newly introduced Raspberry Pi 3 and 4) now share the same U-Boot source package.
This is a fundamental step toward enabling transactional updates with rollbacks
with the
-[Apertis update manager](https://gitlab.apertis.org/pkg/target/apertis-update-manager/)
+[Apertis update manager](https://gitlab.apertis.org/pkg/apertis-update-manager/)
on all the reference platforms.
### Rhosydd VISS
-[Rhosydd](https://gitlab.apertis.org/pkg/target/rhosydd/), the vehicle device
+[Rhosydd](https://gitlab.apertis.org/pkg/rhosydd/), the vehicle device
daemon implementing the
[sensors and actuators API]( {{< ref "sensors-and-actuators.md" >}} )
has been
-[rebased to the data model](https://gitlab.apertis.org/pkg/target/rhosydd/-/merge_requests/16)
+[rebased to the data model](https://gitlab.apertis.org/pkg/rhosydd/-/merge_requests/16)
from the latest W3C specification, as
[described in the design document]( {{< ref "sensors-and-actuators.md#sensors-and-actuators-api" >}} ).
@@ -199,7 +199,7 @@ specific image.
Requested by a product team to improve the responsiveness of shutdown of
`ubihealthd` on NAND devices, a patch that was proposed upstream but didn't get
landed has been cleaned up and
-[is now shipped by Apertis](https://gitlab.apertis.org/pkg/target/mtd-utils/-/merge_requests/2).
+[is now shipped by Apertis](https://gitlab.apertis.org/pkg/mtd-utils/-/merge_requests/2).
The patch splits up updating of PEB statistics and adds checks for the shutdown
status through the main loop, reducing the shutdown time noticeably.
@@ -207,7 +207,7 @@ status through the main loop, reducing the shutdown time noticeably.
### HTTP fixes in APT
After experiencing recurring corruption errors when downloading packages, a bunch of patches
-[fixing some nasty HTTP issues](https://gitlab.apertis.org/pkg/target/apt/-/merge_requests/14)
+[fixing some nasty HTTP issues](https://gitlab.apertis.org/pkg/apt/-/merge_requests/14)
have been discussed with the APT upstream maintainers and have been backported
to the version of APT shipped by Apertis.
@@ -223,7 +223,7 @@ until the end of shutdown.
Since shutting down the system without failures is a highly desirable trait in
embedded products using systemd, the
[upstream fix for the issue](https://github.com/systemd/systemd/issues/867) has been
-[backported to the version shipped by Apertis](https://gitlab.apertis.org/pkg/target/systemd/-/merge_requests/26)
+[backported to the version shipped by Apertis](https://gitlab.apertis.org/pkg/systemd/-/merge_requests/26)
after a substantial rework to adapt to the older systemd release.
### Automated testing of the packaging CI pipeline
--
GitLab