Updated ghostbsd-version and pkg config for package base

ghostbsd · Jun 30, 2024 · 86bfec6 · 86bfec6
1 parent 2c916f8
commit 86bfec6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -3,4 +3,4 @@
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
 # *       @global-owner1 @global-owner2
-* @ghostbsd/developers
+* @ghostbsd/contributors @ghostbsd/new-contributors @ghostbsd/core-contributors @ghostbsd/project-leader
diff --git a/bin/ghostbsd-version/ghostbsd-version.sh b/bin/ghostbsd-version/ghostbsd-version.sh
@@ -48,7 +48,7 @@ freebsd_version() {
 }
 
 os_version() {
-  pkg query '%v' os-generic-userland-base
+  pkg query '%v' GhostBSD-runtime
 }
 
 usage() {

diff --git a/release/pkg_repos/release-dvd.conf b/release/pkg_repos/release-dvd.conf
@@ -4,3 +4,10 @@ release: {
   pubkey: "/usr/share/keys/ssl/certs/ghostbsd.cert",
   enabled: yes
 }
+
+GhostBSD_base: {
+  url: "http://pkg.ghostbsd.org/stable/${ABI}/base",
+  signature_type: "pubkey",
+  pubkey: "/usr/share/keys/ssl/certs/ghostbsd.cert",
+  enabled: yes
+}
diff --git a/sys/conf/package-version b/sys/conf/package-version
@@ -1 +1 @@
-24.04.1
+24.04.2
diff --git a/usr.sbin/pkg/GhostBSD.conf b/usr.sbin/pkg/GhostBSD.conf
@@ -13,3 +13,10 @@ GhostBSD: {
   pubkey: "/usr/share/keys/ssl/certs/ghostbsd.cert",
   enabled: yes
 }
+
+GhostBSD_base: {
+  url: "http://pkg.ghostbsd.org/stable/${ABI}/base",
+  signature_type: "pubkey",
+  pubkey: "/usr/share/keys/ssl/certs/ghostbsd.cert",
+  enabled: yes
+}