brl/citadel
1
0
Fork 2
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

upgrade poky layer to 'kirkstone' release 4.0.1

Browse Source 
- removed layers meta-rust and meta-clang
- added new dependencies to Makefile
- changed override syntax across all recipe files
- updated conf files from hardknott to kirkstone
- SRC_URI git URLS fixed to always include branch and protocol
- LICENSE fields updated with new naming convention
- updated citadel-tools dependencies

- upgraded mozjs to mozjs-91

No longer needed because poky includes newer version (or new enough):

- glib-2.0
- libgudev
- xorgproto
- libxfixes
- libinput
- wayland-protocols
- vte
This commit is contained in:
Bruce Leidl 2022-05-28 11:20:07 -04:00
parent d8c810d707
commit be34ea65f3
210 changed files with 1336 additions and 2257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -55,7 +55,7 @@ kernel-test: ## Boot kernel with Qemu ('ctrl-a x' to exit qemu)
@scripts/qemu-boot kernel
install-build-deps:
sudo apt install --no-install-recommends build-essential python bzip2 cpio chrpath diffstat file texinfo inkscape libgmp-dev libmpc-dev libelf-dev gawk wget debootstrap
sudo apt install --no-install-recommends build-essential python3-full bzip2 cpio chrpath diffstat file texinfo inkscape libgmp-dev libmpc-dev libelf-dev gawk wget debootstrap lz4 zstd
$(REALMFS_IMAGE):
@mkdir -p build/realmfs

10
meta-citadel/classes/citadel-image.bbclass
View File

@ -1,8 +1,8 @@
DEPENDS_append = " citadel-tools-native mtools-native cryptsetup-native coreutils-native"
DEPENDS:append = " citadel-tools-native mtools-native cryptsetup-native coreutils-native"
# Block size must be 4096 or dm-verity won't work
EXTRA_IMAGECMD_ext4 = "-i 4096 -b 4096"
EXTRA_IMAGECMD:ext4 = "-i 4096 -b 4096"
IMAGE_FSTYPES = "ext4"
IMAGE_OVERHEAD_FACTOR = "1.2"
@ -41,7 +41,9 @@ do_citadel_mkimage[vardepsexclude] = "DATETIME"
IMAGE_POSTPROCESS_COMMAND += " generate_shasum_buildhistory ;"
BUILDHISTORY_CURRENT_IMAGE_DIR = "${TOPDIR}/buildhistory/images/${MACHINE_ARCH}/${TCLIBC}/${IMAGE_BASENAME}"
generate_shasum_buildhistory() {
mkdir -p ${BUILDHISTORY_DIR_IMAGE}
( cd ${IMAGE_ROOTFS} && find . -type f -exec sha1sum '{}' \; | sort -k2 > ${BUILDHISTORY_DIR_IMAGE}/image-shasums.txt )
mkdir -p ${BUILDHISTORY_CURRENT_IMAGE_DIR}
( cd ${IMAGE_ROOTFS} && find . -type f -exec sha1sum '{}' \; | sort -k2 > ${BUILDHISTORY_CURRENT_IMAGE_DIR}/image-shasums.txt )
}

2
meta-citadel/conf/bblayers.conf.sample
View File

@ -8,8 +8,6 @@ BBFILES ?= ""
BBLAYERS ?= " \
##OEROOT##/meta \
##OEROOT##/../meta-intel \
##OEROOT##/../meta-rust \
##OEROOT##/../meta-citadel \
##OEROOT##/../meta-gnome \
##OEROOT##/../meta-clang \
"

13
meta-citadel/conf/distro/citadel-distro.conf
View File

@ -35,18 +35,9 @@ IMAGE_LINGUAS = "en-us"
BUILD_REPRODUCIBLE_BINARIES = "1"
INHERIT += "reproducible_build"
INHERIT += "buildhistory"
PREFERRED_RPROVIDER_libdevmapper-native = "libdevmapper-native"
# Override meta-rust dependencies.
#
# Instead of bringing in all of openembedded, we imported the two recipes
# meta-rust depends on:
#
# meta-citadel/recipes-support/libgit2/
# meta-citadel/recipes-support/libssh2/
#
LAYERDEPENDS_rust-layer = "core"
require conf/distro/include/security_flags.inc

5
meta-citadel/conf/layer.conf
View File

@ -5,7 +5,6 @@ BBPATH =. "${LAYERDIR}:"
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/recipes-*/*/*.bbappend"
BBMASK += "meta-intel/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend"
LICENSE_PATH += "${LAYERDIR}/licenses"
# see https://patches.openembedded.org/patch/164502/
@ -13,9 +12,9 @@ PREFERRED_RPROVIDER_libdevmapper = "lvm2"
BBFILE_COLLECTIONS += "citadel"
BBFILE_PATTERN_citadel = "^${LAYERDIR}/"
BBFILE_PRIORITY_citadel = "5"
BBFILE_PRIORITY_citadel = "4"
LAYERSERIES_COMPAT_citadel = "hardknott"
LAYERSERIES_COMPAT_citadel = "kirkstone"
# This should only be incremented on significant changes that will
# cause compatibility issues with other layers

167
meta-citadel/conf/local.conf.sample
View File

@ -2,32 +2,45 @@
# This file is your local configuration file and is where all local user settings
# are placed. The comments in this file give some guide to the options a new user
# to the system might want to change but pretty much any configuration option can
# be set in this file. More adventurous users can look at local.conf.extended
# which contains other examples of configuration which can be placed in this file
# but new users likely won't need any of them initially.
# be set in this file. More adventurous users can look at
# local.conf.sample.extended which contains other examples of configuration which
# can be placed in this file but new users likely won't need any of them
# initially.
#
# Lines starting with the '#' character are commented out and in some cases the
# default values are provided as comments to show people example syntax. Enabling
# the option is a question of removing the # character and making any change to the
# variable as required.
# Distro configuration:
#
# meta-citadel-distro/conf/distro/citadel-distro.conf
# Machine Selection
#
DISTRO ?= "citadel-distro"
# Machine configuration:
# You need to select a specific machine to target the build with. There are a selection
# of emulated machines available which can boot and run in the QEMU emulator:
#
# meta-intel/conf/machine/intel-corei7-64.conf
#MACHINE ?= "qemuarm"
#MACHINE ?= "qemuarm64"
#MACHINE ?= "qemumips"
#MACHINE ?= "qemumips64"
#MACHINE ?= "qemuppc"
#MACHINE ?= "qemux86"
#MACHINE ?= "qemux86-64"
#
# There are also the following hardware board target machines included for
# demonstration purposes:
#
#MACHINE ?= "beaglebone-yocto"
#MACHINE ?= "genericx86"
#MACHINE ?= "genericx86-64"
#MACHINE ?= "edgerouter"
#
# This sets the default machine to be qemux86-64 if no other machine is selected:
#MACHINE ??= "qemux86-64"
MACHINE ?= "intel-corei7-64"
DEFAULT_TIMEZONE = "America/New_York"
DEPLOY_DIR_IMAGE = "${TOPDIR}/images"
#
#
# Where to place downloads
#
@ -69,6 +82,34 @@ DEPLOY_DIR_IMAGE = "${TOPDIR}/images"
#
#TMPDIR = "${TOPDIR}/tmp"
#
# Default policy config
#
# The distribution setting controls which policy settings are used as defaults.
# The default value is fine for general Yocto project use, at least initially.
# Ultimately when creating custom policy, people will likely end up subclassing
# these defaults.
#
DISTRO ?= "citadel-distro"
# As an example of a subclass there is a "bleeding" edge policy configuration
# where many versions are set to the absolute latest code from the upstream
# source control systems. This is just mentioned here as an example, its not
# useful to most new users.
# DISTRO ?= "poky-bleeding"
#
# Package Management configuration
#
# This variable lists which packaging formats to enable. Multiple package backends
# can be enabled at once and the first item listed in the variable will be used
# to generate the root filesystems.
# Options are:
# - 'package_deb' for debian style deb files
# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
# - 'package_rpm' for rpm style packages
# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
# We default to rpm:
PACKAGE_CLASSES ?= "package_deb"
#
# SDK target architecture
@ -76,7 +117,7 @@ DEPLOY_DIR_IMAGE = "${TOPDIR}/images"
# This variable specifies the architecture to build SDK items for and means
# you can build the SDK packages for architectures other than the machine you are
# running the build on (i.e. building i686 packages on an x86_64 host).
# Supported values are i686 and x86_64
# Supported values are i686, x86_64, aarch64
#SDKMACHINE ?= "i686"
#
@ -87,6 +128,8 @@ DEPLOY_DIR_IMAGE = "${TOPDIR}/images"
# variable can contain the following options:
# "dbg-pkgs" - add -dbg packages for all installed packages
# (adds symbol information for debugging/profiling)
# "src-pkgs" - add -src packages for all installed packages
# (adds source code for debugging)
# "dev-pkgs" - add -dev packages for all installed packages
# (useful if you want to develop against libs in the image)
# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages
@ -110,20 +153,18 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
# enable extra features. Some available options which can be included in this variable
# are:
# - 'buildstats' collect build statistics
# - 'image-mklibs' to reduce shared library files size for an image
# - 'image-prelink' in order to prelink the filesystem image
# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
USER_CLASSES ?= "buildstats"
#
# Runtime testing of images
#
# The build system can test booting virtual machine images under qemu (an emulator)
# after any root filesystems are created and run tests against those images. To
# enable this uncomment this line. See classes/testimage(-auto).bbclass for
# further details.
#TEST_IMAGE = "1"
# after any root filesystems are created and run tests against those images. It can also
# run tests against any SDK that are built. To enable this uncomment these lines.
# See classes/test{image,sdk}.bbclass for further details.
#IMAGE_CLASSES += "testimage testsdk"
#TESTIMAGE_AUTO:qemuall = "1"
#
# Interactive shell configuration
#
@ -148,29 +189,29 @@ PATCHRESOLVE = "noop"
#
# Monitor the disk space during the build. If there is less that 1GB of space or less
# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort
# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard halt
# of the build. The reason for this is that running completely out of space can corrupt
# files and damages the build in ways which may not be easily recoverable.
# It's necesary to monitor /tmp, if there is no space left the build will fail
# It's necessary to monitor /tmp, if there is no space left the build will fail
# with very exotic errors.
BB_DISKMON_DIRS = "\
BB_DISKMON_DIRS ??= "\
STOPTASKS,${TMPDIR},1G,100K \
STOPTASKS,${DL_DIR},1G,100K \
STOPTASKS,${SSTATE_DIR},1G,100K \
STOPTASKS,/tmp,100M,100K \
ABORT,${TMPDIR},100M,1K \
ABORT,${DL_DIR},100M,1K \
ABORT,${SSTATE_DIR},100M,1K \
ABORT,/tmp,10M,1K"
HALT,${TMPDIR},100M,1K \
HALT,${DL_DIR},100M,1K \
HALT,${SSTATE_DIR},100M,1K \
HALT,/tmp,10M,1K"
#
# Shared-state files from other locations
#
# As mentioned above, shared state files are prebuilt cache data objects which can
# As mentioned above, shared state files are prebuilt cache data objects which can be
# used to accelerate build time. This variable can be used to configure the system
# to search other mirror locations for these objects before it builds the data itself.
#
# This can be a filesystem directory, or a remote url such as http or ftp. These
# This can be a filesystem directory, or a remote url such as https or ftp. These
# would contain the sstate-cache results from previous builds (possibly from other
# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the
# cache locations to check for the shared objects.
@ -178,33 +219,65 @@ BB_DISKMON_DIRS = "\
# at the end as shown in the examples below. This will be substituted with the
# correct path within the directory structure.
#SSTATE_MIRRORS ?= "\
#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
#file://.* https://someserver.tld/share/sstate/PATH;downloadfilename=PATH \
#file://.* file:///some/local/dir/sstate/PATH"
#
# Yocto Project SState Mirror
#
# The Yocto Project has prebuilt artefacts available for its releases, you can enable
# use of these by uncommenting the following lines. This will mean the build uses
# the network to check for artefacts at the start of builds, which does slow it down
# equally, it will also speed up the builds by not having to build things if they are
# present in the cache. It assumes you can download something faster than you can build it
# which will depend on your network.
# Note: For this to work you also need hash-equivalence passthrough to the matching server
#
#BB_HASHSERVE_UPSTREAM = "typhoon.yocto.io:8687"
#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/4.0/PATH;downloadfilename=PATH"
#
# Qemu configuration
#
# By default qemu will build with a builtin VNC server where graphical output can be
# seen. The two lines below enable the SDL backend too. By default libsdl-native will
# be built, if you want to use your host's libSDL instead of the minimal libsdl built
# by libsdl-native then uncomment the ASSUME_PROVIDED line below.
PACKAGECONFIG_append_pn-qemu-native = " sdl"
PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
#ASSUME_PROVIDED += "libsdl-native"
# By default native qemu will build with a builtin VNC server where graphical output can be
# seen. The line below enables the SDL UI frontend too.
PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
# By default libsdl2-native will be built, if you want to use your host's libSDL instead of
# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below.
#ASSUME_PROVIDED += "libsdl2-native"
# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds
# a handy set of menus for controlling the emulator.
#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+"
#
# Hash Equivalence
#
# Enable support for automatically running a local hash equivalence server and
# instruct bitbake to use a hash equivalence aware signature generator. Hash
# equivalence improves reuse of sstate by detecting when a given sstate
# artifact can be reused as equivalent, even if the current task hash doesn't
# match the one that generated the artifact.
#
# A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format
#
#BB_HASHSERVE = "auto"
#BB_SIGNATURE_HANDLER = "OEEquivHash"
#
# Memory Resident Bitbake
#
# Bitbake's server component can stay in memory after the UI for the current command
# has completed. This means subsequent commands can run faster since there is no need
# for bitbake to reload cache files and so on. Number is in seconds, after which the
# server will shut down.
#
#BB_SERVER_TIMEOUT = "60"
# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
# track the version of this file when it was generated. This can safely be ignored if
# this doesn't mean anything to you.
CONF_VERSION = "1"
INHERIT+="toaster buildhistory"
#
# Enable to build a custom kernel with options set so that powertop can be used, and
# will also build citadel-image with powertop package installed
#
# DISTROOVERRIDES = "citadel-powertop"
CONF_VERSION = "2"
#
# Set to build citadel-tools recipes from a local copy on the filesystem rather than

6
meta-citadel/recipes-citadel/bbappends/base-files_%.bbappend
View File

@ -1,15 +1,15 @@
hostname="subgraph"
dirs1777_remove = "${localstatedir}/volatile/tmp"
dirs1777:remove = "${localstatedir}/volatile/tmp"
dirs755="/boot /dev /usr/bin /usr/sbin /usr/lib /etc /etc/default /etc/skel /usr/lib /mnt /proc /home/root /run /usr /usr/bin /usr/share/doc/base-files-3.0.14 /usr/include /usr/lib /usr/sbin /usr/share /usr/share/common-licenses /usr/share/info /usr/share/man /usr/share/misc /var /sys /home /media"
volatiles = ""
FILESEXTRAPATHS_prepend := "${THISDIR}/base-files:"
FILESEXTRAPATHS:prepend := "${THISDIR}/base-files:"
SRC_URI += "file://profile"
do_install_append () {
do_install:append () {
rm ${D}${sysconfdir}/fstab
rm ${D}${sysconfdir}/skel/.bashrc
rm ${D}${sysconfdir}/skel/.profile

4
meta-citadel/recipes-citadel/bbappends/btrfs-tools_%.bbappend
View File

@ -1,4 +1,4 @@
# Put python library into a separate package and avoid dragging in python as RDEPENDS
PACKAGES =+ "${PN}-python"
FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}"
RDEPENDS_${PN}_remove = "${PYTHON_PN}-core"
FILES:${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}"
RDEPENDS:${PN}:remove = "${PYTHON_PN}-core"

2
meta-citadel/recipes-citadel/bbappends/dbus_%.bbappend
View File

@ -1 +1 @@
PACKAGECONFIG_append = " user-session"
PACKAGECONFIG:append = " user-session"

4
meta-citadel/recipes-citadel/bbappends/gnome-terminal_%.bbappend
View File

@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/gnome-terminal:"
FILESEXTRAPATHS:prepend := "${THISDIR}/gnome-terminal:"
SRC_URI += "\
file://gnome-terminal-citadel.service \
@ -7,7 +7,7 @@ SRC_URI += "\
file://50_gnome-terminal.gschema.override \
"
do_install_append() {
do_install:append() {
install -m 644 ${WORKDIR}/50_gnome-terminal.gschema.override ${D}${datadir}/glib-2.0/schemas
install -m 644 ${WORKDIR}/org.gnome.TerminalCitadel.desktop ${D}${datadir}/applications
install -m 644 ${WORKDIR}/org.gnome.TerminalCitadel.service ${D}${datadir}/dbus-1/services

2
meta-citadel/recipes-citadel/bbappends/gobject-introspection_%.bbappend
View File

@ -1,5 +1,5 @@
PACKAGES =+ "libgirepository"
FILES_libgirepository = "\
FILES:libgirepository = "\
${libdir}/libgirepository-1.0${SOLIBS} \
${libdir}/girepository-1.0 \
"

33
meta-citadel/recipes-citadel/bbappends/gtk+3/gtk-update-icon-cache-reproducibility-fix.patch
View File

@ -1,33 +0,0 @@
--- a/gtk/updateiconcache.c 2019-04-29 02:43:13.876445467 -0400
+++ b/gtk/updateiconcache.c 2019-04-29 02:47:17.913457103 -0400
@@ -600,6 +600,7 @@
{
GHashTable *dir_hash;
GDir *dir;
+ GList *list = NULL, *iterator = NULL;
const gchar *name;
gchar *dir_path;
gboolean dir_added = FALSE;
@@ -617,6 +618,14 @@
while ((name = g_dir_read_name (dir)))
{
+ list = g_list_prepend (list, g_strdup (name));
+ }
+
+ list = g_list_sort (list, (GCompareFunc) strcmp);
+ for (iterator = list; iterator; iterator = iterator->next)
+ {
+ name = iterator->data;
+
gchar *path;
gboolean retval;
int flags = 0;
@@ -695,6 +704,7 @@
g_free (path);
}
+ g_list_free_full (list, g_free);
g_dir_close (dir);
/* Move dir into the big file hash */

6
meta-citadel/recipes-citadel/bbappends/gtk+3_%.bbappend
View File

@ -1,6 +1,2 @@
# Remove this dependency so it doesn't get dragged in with gtk. These icons are in citadel-extra-image now
GTKBASE_RRECOMMENDS_remove = "adwaita-icon-theme-symbolic"
FILESEXTRAPATHS_prepend := "${THISDIR}/gtk+3:"
SRC_URI += "file://gtk-update-icon-cache-reproducibility-fix.patch"
GTKBASE_RRECOMMENDS:remove = "adwaita-icon-theme-symbolic"

2
meta-citadel/recipes-citadel/bbappends/iptables_%.bbappend
View File

@ -1 +1 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/iptables:"
FILESEXTRAPATHS:prepend := "${THISDIR}/iptables:"

2
meta-citadel/recipes-citadel/bbappends/libdevmapper_%.bbappend
View File

@ -1,2 +1,2 @@
PACKAGECONFIG = "odirect"
PACKAGECONFIG_append_class-target = " udev"
PACKAGECONFIG:append:class-target = " udev"

2
meta-citadel/recipes-citadel/bbappends/libpam_%.bbappend
View File

@ -1,3 +1,3 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/libpam:"
FILESEXTRAPATHS:prepend := "${THISDIR}/libpam:"
SRC_URI += "file://pam.d/common-auth"

2
meta-citadel/recipes-citadel/bbappends/lvm2_%.bbappend
View File

@ -1,2 +1,2 @@
# files/lvm.conf is customized to prevent writing to /etc
FILESEXTRAPATHS_prepend := "${THISDIR}/lvm2:"
FILESEXTRAPATHS:prepend := "${THISDIR}/lvm2:"

2
meta-citadel/recipes-citadel/bbappends/mesa_%.bbappend
View File

@ -1 +1 @@
GALLIUMDRIVERS_append = ",iris"
GALLIUMDRIVERS:append = ",iris"

6
meta-citadel/recipes-citadel/bbappends/pulseaudio_14.%.bbappend
View File

@ -1,6 +0,0 @@
RDEPENDS_pulseaudio-server_remove = "pulseaudio-module-console-kit"
RDEPENDS_remove = "pulseaudio-module-x11-cork-request \
pulseaudio-module-x11-publish \
pulseaudio-module-x11-xsmp \
"
PACKAGECONFIG_remove = "x11"

6
meta-citadel/recipes-citadel/bbappends/pulseaudio_15.%.bbappend Normal file
View File

@ -0,0 +1,6 @@
RDEPENDS:pulseaudio-server:remove = "pulseaudio-module-console-kit"
RDEPENDS:remove = "pulseaudio-module-x11-cork-request \
pulseaudio-module-x11-publish \
pulseaudio-module-x11-xsmp \
"
PACKAGECONFIG:remove = "x11"

2
meta-citadel/recipes-citadel/bbappends/readline_%.bbappend
View File

@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/readline:"
FILESEXTRAPATHS:prepend := "${THISDIR}/readline:"
SRC_URI += "\
file://inputrc \

1
meta-citadel/recipes-citadel/bbappends/rust-llvm_%.bbappend
View File

@ -1 +0,0 @@
EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=MinSizeRel "

4
meta-citadel/recipes-citadel/bbappends/systemd-conf_%.bbappend
View File

@ -1,6 +1,6 @@
FILES_${PN} += "${sysconfdir}/machine-id"
FILES:${PN} += "${sysconfdir}/machine-id"
do_install_append() {
do_install:append() {
install -d ${D}${sysconfdir}
echo "a4e415feff81466c925aab34b0c35a3c" > ${D}${sysconfdir}/machine-id
}

14
meta-citadel/recipes-citadel/bbappends/systemd_%.bbappend
View File

@ -1,18 +1,18 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
RDEPENDS_${PN}_remove = "systemd-serialgetty"
RDEPENDS_${PN}_remove = "volatile-binds"
RDEPENDS_${PN}_remove = "update-rc.d"
RDEPENDS:${PN}:remove = "systemd-serialgetty"
RDEPENDS:${PN}:remove = "volatile-binds"
RDEPENDS:${PN}:remove = "update-rc.d"
ALTERNATIVE_${PN}_remove = "resolv-conf"
ALTERNATIVE:${PN}:remove = "resolv-conf"
GROUPADD_PARAM_${PN} += "-r wheel; -r kvm; -r render"
GROUPADD_PARAM:${PN} += "-r wheel; -r kvm; -r render"
PACKAGECONFIG = "\
efi acl ldconfig pam usrmerge rfkill backlight binfmt hostnamed localed logind machined myhostname \
nss polkit randomseed seccomp timedated utmp timesyncd kmod sysusers gshadow cryptsetup \
"
do_install_append() {
do_install:append() {
rm -f ${D}${sysconfdir}/tmpfiles.d/00-create-volatile.conf
ln -s rescue.target ${D}${systemd_unitdir}/system/kbrequest.target
}

2
meta-citadel/recipes-citadel/bbappends/util-linux_%.bbappend
View File

@ -1 +1 @@
EXTRA_OECONF_append = " --disable-raw"
EXTRA_OECONF:append = " --disable-raw"

2
meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb
View File

@ -33,4 +33,4 @@ do_install() {
install -m 644 ${WORKDIR}/dconf-output/citadel ${D}${datadir}/factory/storage/citadel-state/citadel-dconf/user
}
FILES_${PN} = "/"
FILES:${PN} = "/"

8
meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
View File

@ -69,15 +69,15 @@ SRC_URI = "\
"
USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = "-m -u 1000 -s /bin/bash citadel"
USERADD_PARAM:${PN} = "-m -u 1000 -s /bin/bash citadel"
INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
# for citadel-ifconfig.sh
RDEPENDS_${PN} = "bash"
RDEPENDS:${PN} = "bash"
inherit allarch systemd useradd
SYSTEMD_SERVICE_${PN} = "zram-swap.service watch-run-user.path sway-session-switcher.service x11-session-switcher.service citadel-installer-backend.service installer-session-switcher.service citadel-setpassword.service"
SYSTEMD_SERVICE:${PN} = "zram-swap.service watch-run-user.path sway-session-switcher.service x11-session-switcher.service citadel-installer-backend.service installer-session-switcher.service citadel-setpassword.service"
do_install() {
install -m 0755 -d ${D}/storage
@ -194,4 +194,4 @@ do_install() {
install -d ${D}/opt/share
}
FILES_${PN} = "/"
FILES:${PN} = "/"

2
meta-citadel/recipes-citadel/citadel-documentation/citadel-documentation.bb
View File

@ -17,4 +17,4 @@ do_install() {
install -m 0644 ${WORKDIR}/citadel-documentation.desktop ${D}${datadir}/applications
}
FILES_${PN} = "/"
FILES:${PN} = "/"

4
meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb
View File

@ -32,11 +32,9 @@ set_disable_root_password() {
setup_var() {
install -m 0755 -d ${IMAGE_ROOTFS}/usr/share/factory/var
rmdir ${IMAGE_ROOTFS}/var/log/journal
install -m 0755 -d ${IMAGE_ROOTFS}/usr/share/factory/var/log
mv ${IMAGE_ROOTFS}/var/lib ${IMAGE_ROOTFS}/usr/share/factory/var
mv ${IMAGE_ROOTFS}/var/log ${IMAGE_ROOTFS}/usr/share/factory/var
mv ${IMAGE_ROOTFS}/var/cache ${IMAGE_ROOTFS}/usr/share/factory/var
mv ${IMAGE_ROOTFS}/var/spool ${IMAGE_ROOTFS}/usr/share/factory/var
mv ${IMAGE_ROOTFS}/var/run ${IMAGE_ROOTFS}/usr/share/factory/var

3
meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel-base.bb
View File

@ -2,6 +2,7 @@
# Base set of packages, should not include anything needed only on desktop
#
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
BASH_COMPLETION = "\
@ -13,7 +14,7 @@ BASH_COMPLETION = "\
util-linux-bash-completion \
"
RDEPENDS_${PN} = "\
RDEPENDS:${PN} = "\
keyutils \
citadel-config \
base-files \

3
meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb
View File

@ -1,7 +1,8 @@
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
RDEPENDS_${PN} = "\
RDEPENDS:${PN} = "\
packagegroup-citadel-base \
packagegroup-desktop \
packagegroup-gnome \

6
meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb
View File

@ -2,13 +2,14 @@
# Packages common to any desktop environment
#
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
CITADEL_POWERTOP = ""
# append only if citadel-powertop override is set
CITADEL_POWERTOP_append_citadel-powertop= "powertop"
CITADEL_POWERTOP:append:citadel-powertop= "powertop"
RDEPENDS_${PN} = "\
RDEPENDS:${PN} = "\
${CITADEL_POWERTOP} \
accountsservice \
upower \
@ -25,7 +26,6 @@ RDEPENDS_${PN} = "\
wireless-regdb \
polkit \
network-manager-applet \
clutter-1.0 \
libxkbcommon \
xkeyboard-config \
libusb1 \

3
meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb
View File

@ -1,7 +1,8 @@
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
RDEPENDS_${PN} = "\
RDEPENDS:${PN} = "\
atk \
at-spi2-atk \
libgweather \

4
meta-citadel/recipes-citadel/packagegroups/packagegroup-sway.bb
View File

@ -1,7 +1,9 @@
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
RDEPENDS_${PN} = "\
RDEPENDS:${PN} = "\
wlroots \
sway \
xcb-util-xrm \

2
meta-citadel/recipes-citadel/packagegroups/packagegroup-theme.bb
View File

@ -1,4 +1,4 @@
inherit packagegroup
RDEPENDS_${PN} = "ttf-roboto"
RDEPENDS:${PN} = "ttf-roboto"

191
meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb
View File

@ -3,14 +3,14 @@ HOMEPAGE = "http://github.com/subgraph/citadel"
LICENSE = "CLOSED"
LIC_FILES_CHKSUM=""
inherit cargo systemd gsettings
inherit cargo systemd gsettings pkgconfig
#
# Update this when changes are pushed to github
#
SRCREV = "668227af1e2b01fa0a06216eb25a4e3251f50aba"
SRCREV = "3dbfda2c40aac28e2a1df1dddae039113df1c6f0"
GIT_URI = "git://github.com/brl/citadel-tools.git;protocol=https"
GIT_URI = "git://github.com/brl/citadel-tools.git;protocol=https;branch=master"
# If Cargo.lock changes in citadel-tools, this needs to be updated.
# cargo bitbake does not support workspaces so as a workaround first
@ -22,40 +22,40 @@ GIT_URI = "git://github.com/brl/citadel-tools.git;protocol=https"
SRC_URI += " \
crate://crates.io/acl-sys/1.2.2 \
crate://crates.io/addr2line/0.15.2 \
crate://crates.io/addr2line/0.17.0 \
crate://crates.io/adler/1.0.2 \
crate://crates.io/aho-corasick/0.7.18 \
crate://crates.io/ansi_term/0.11.0 \
crate://crates.io/anyhow/1.0.42 \
crate://crates.io/array-macro/1.0.3 \
crate://crates.io/async-broadcast/0.3.3 \
crate://crates.io/ansi_term/0.12.1 \
crate://crates.io/anyhow/1.0.57 \
crate://crates.io/array-macro/1.0.5 \
crate://crates.io/async-broadcast/0.3.4 \
crate://crates.io/async-channel/1.6.1 \
crate://crates.io/async-executor/1.4.1 \
crate://crates.io/async-io/1.6.0 \
crate://crates.io/async-lock/2.4.0 \
crate://crates.io/async-task/4.0.3 \
crate://crates.io/async-lock/2.5.0 \
crate://crates.io/async-task/4.2.0 \
crate://crates.io/atk-sys/0.14.0 \
crate://crates.io/atk/0.14.0 \
crate://crates.io/atty/0.2.14 \
crate://crates.io/autocfg/1.0.1 \
crate://crates.io/backtrace/0.3.60 \
crate://crates.io/autocfg/1.1.0 \
crate://crates.io/backtrace/0.3.65 \
crate://crates.io/bincode/1.3.3 \
crate://crates.io/bitflags/1.2.1 \
crate://crates.io/block-buffer/0.9.0 \
crate://crates.io/block-cipher/0.7.1 \
crate://crates.io/blowfish/0.5.0 \
crate://crates.io/byteorder/1.4.3 \
crate://crates.io/cache-padded/1.1.1 \
crate://crates.io/cairo-rs/0.14.7 \
crate://crates.io/cairo-sys-rs/0.14.0 \
crate://crates.io/cc/1.0.69 \
crate://crates.io/cache-padded/1.2.0 \
crate://crates.io/cairo-rs/0.14.9 \
crate://crates.io/cairo-sys-rs/0.14.9 \
crate://crates.io/cc/1.0.73 \
crate://crates.io/cfg-expr/0.8.1 \
crate://crates.io/cfg-if/0.1.10 \
crate://crates.io/cfg-if/1.0.0 \
crate://crates.io/chrono/0.4.19 \
crate://crates.io/clap/2.33.3 \
crate://crates.io/clap/2.34.0 \
crate://crates.io/concurrent-queue/1.2.2 \
crate://crates.io/cpufeatures/0.1.5 \
crate://crates.io/cpufeatures/0.2.2 \
crate://crates.io/crossbeam-channel/0.3.9 \
crate://crates.io/crossbeam-utils/0.6.6 \
crate://crates.io/crypto-mac/0.8.0 \
@ -64,50 +64,50 @@ SRC_URI += " \
crate://crates.io/dbus/0.8.4 \
crate://crates.io/derivative/2.2.0 \
crate://crates.io/digest/0.9.0 \
crate://crates.io/easy-parallel/3.1.0 \
crate://crates.io/ed25519/1.1.1 \
crate://crates.io/easy-parallel/3.2.0 \
crate://crates.io/ed25519/1.5.2 \
crate://crates.io/either/1.6.1 \
crate://crates.io/enum-map-derive/0.4.6 \
crate://crates.io/enum-map-internals/0.1.3 \
crate://crates.io/enum-map-internals/0.1.2 \
crate://crates.io/enum-map/0.5.0 \
crate://crates.io/enumflags2/0.6.4 \
crate://crates.io/enumflags2_derive/0.6.4 \
crate://crates.io/enumset/0.3.19 \
crate://crates.io/enumset_derive/0.3.2 \
crate://crates.io/event-listener/2.5.1 \
crate://crates.io/event-listener/2.5.2 \
crate://crates.io/failure/0.1.8 \
crate://crates.io/failure_derive/0.1.8 \
crate://crates.io/fastrand/1.4.1 \
crate://crates.io/fastrand/1.7.0 \
crate://crates.io/field-offset/0.3.4 \
crate://crates.io/futures-channel/0.3.15 \
crate://crates.io/futures-core/0.3.15 \
crate://crates.io/futures-executor/0.3.15 \
crate://crates.io/futures-io/0.3.15 \
crate://crates.io/futures-channel/0.3.21 \
crate://crates.io/futures-core/0.3.21 \
crate://crates.io/futures-executor/0.3.21 \
crate://crates.io/futures-io/0.3.21 \
crate://crates.io/futures-lite/1.12.0 \
crate://crates.io/futures-macro/0.3.15 \
crate://crates.io/futures-sink/0.3.15 \
crate://crates.io/futures-task/0.3.15 \
crate://crates.io/futures-util/0.3.15 \
crate://crates.io/futures-macro/0.3.21 \
crate://crates.io/futures-sink/0.3.21 \
crate://crates.io/futures-task/0.3.21 \
crate://crates.io/futures-util/0.3.21 \
crate://crates.io/gdk-pixbuf-sys/0.14.0 \
crate://crates.io/gdk-pixbuf/0.14.0 \
crate://crates.io/gdk-sys/0.14.0 \
crate://crates.io/gdk/0.14.2 \
crate://crates.io/generic-array/0.14.4 \
crate://crates.io/gdk/0.14.3 \
crate://crates.io/generic-array/0.14.5 \
crate://crates.io/getrandom/0.1.16 \
crate://crates.io/getrandom/0.2.3 \
crate://crates.io/gimli/0.24.0 \
crate://crates.io/getrandom/0.2.6 \
crate://crates.io/gimli/0.26.1 \
crate://crates.io/gio-sys/0.14.0 \
crate://crates.io/gio/0.14.6 \
crate://crates.io/gio/0.14.8 \
crate://crates.io/glib-macros/0.10.1 \
crate://crates.io/glib-macros/0.14.1 \
crate://crates.io/glib-sys/0.10.1 \
crate://crates.io/glib-sys/0.14.0 \
crate://crates.io/glib/0.10.3 \
crate://crates.io/glib/0.14.5 \
crate://crates.io/glib/0.14.8 \
crate://crates.io/gobject-sys/0.10.0 \
crate://crates.io/gobject-sys/0.14.0 \
crate://crates.io/gtk-sys/0.14.0 \
crate://crates.io/gtk/0.14.1 \
crate://crates.io/gtk/0.14.3 \
crate://crates.io/gtk3-macros/0.14.0 \
crate://crates.io/heck/0.3.3 \
crate://crates.io/hermit-abi/0.1.19 \
@ -115,88 +115,86 @@ SRC_URI += " \
crate://crates.io/hmac/0.8.1 \
crate://crates.io/inotify-sys/0.1.5 \
crate://crates.io/inotify/0.8.3 \
crate://crates.io/instant/0.1.10 \
crate://crates.io/itertools/0.10.1 \
crate://crates.io/instant/0.1.12 \
crate://crates.io/itertools/0.10.3 \
crate://crates.io/itertools/0.9.0 \
crate://crates.io/lazy_static/1.4.0 \
crate://crates.io/libc/0.2.98 \
crate://crates.io/libdbus-sys/0.2.1 \
crate://crates.io/libc/0.2.126 \
crate://crates.io/libdbus-sys/0.2.2 \
crate://crates.io/libsodium-sys/0.2.7 \
crate://crates.io/log/0.4.14 \
crate://crates.io/log/0.4.17 \
crate://crates.io/md-5/0.9.1 \
crate://crates.io/memchr/2.4.0 \
crate://crates.io/memoffset/0.6.4 \
crate://crates.io/miniz_oxide/0.4.4 \
crate://crates.io/memchr/2.5.0 \
crate://crates.io/memoffset/0.6.5 \
crate://crates.io/miniz_oxide/0.5.1 \
crate://crates.io/nix/0.17.0 \
crate://crates.io/nix/0.21.0 \
crate://crates.io/nix/0.21.2 \
crate://crates.io/num-complex/0.2.4 \
crate://crates.io/num-integer/0.1.44 \
crate://crates.io/num-iter/0.1.42 \
crate://crates.io/num-integer/0.1.45 \
crate://crates.io/num-iter/0.1.43 \
crate://crates.io/num-rational/0.2.4 \
crate://crates.io/num-traits/0.2.14 \
crate://crates.io/num-traits/0.2.15 \
crate://crates.io/num/0.2.1 \
crate://crates.io/numtoa/0.1.0 \
crate://crates.io/object/0.25.3 \
crate://crates.io/once_cell/1.8.0 \
crate://crates.io/object/0.28.4 \
crate://crates.io/once_cell/1.10.0 \
crate://crates.io/opaque-debug/0.2.3 \
crate://crates.io/opaque-debug/0.3.0 \
crate://crates.io/owning_ref/0.4.1 \
crate://crates.io/pango-sys/0.10.0 \
crate://crates.io/pango-sys/0.14.0 \
crate://crates.io/pango/0.14.3 \
crate://crates.io/pango/0.14.8 \
crate://crates.io/pango/0.9.1 \
crate://crates.io/parking/2.0.0 \
crate://crates.io/pest/2.1.3 \
crate://crates.io/pin-project-lite/0.2.7 \
crate://crates.io/pin-project-lite/0.2.9 \
crate://crates.io/pin-utils/0.1.0 \
crate://crates.io/pkg-config/0.3.19 \
crate://crates.io/polling/2.1.0 \
crate://crates.io/pkg-config/0.3.25 \
crate://crates.io/polling/2.2.0 \
crate://crates.io/posix-acl/1.0.0 \
crate://crates.io/ppv-lite86/0.2.10 \
crate://crates.io/ppv-lite86/0.2.16 \
crate://crates.io/proc-macro-crate/0.1.5 \
crate://crates.io/proc-macro-crate/1.0.0 \
crate://crates.io/proc-macro-crate/1.1.3 \
crate://crates.io/proc-macro-error-attr/1.0.4 \
crate://crates.io/proc-macro-error/1.0.4 \
crate://crates.io/proc-macro-hack/0.5.19 \
crate://crates.io/proc-macro-nested/0.1.7 \
crate://crates.io/proc-macro2/0.4.30 \
crate://crates.io/proc-macro2/1.0.27 \
crate://crates.io/proc-macro2/1.0.39 \
crate://crates.io/pwhash/0.3.1 \
crate://crates.io/quote/0.6.13 \
crate://crates.io/quote/1.0.9 \
crate://crates.io/quote/1.0.18 \
crate://crates.io/rand/0.7.3 \
crate://crates.io/rand/0.8.4 \
crate://crates.io/rand/0.8.5 \
crate://crates.io/rand_chacha/0.2.2 \
crate://crates.io/rand_chacha/0.3.1 \
crate://crates.io/rand_core/0.5.1 \
crate://crates.io/rand_core/0.6.3 \
crate://crates.io/rand_hc/0.2.0 \
crate://crates.io/rand_hc/0.3.1 \
crate://crates.io/redox_syscall/0.2.9 \
crate://crates.io/redox_syscall/0.2.13 \
crate://crates.io/redox_termios/0.1.2 \
crate://crates.io/regex-syntax/0.6.25 \
crate://crates.io/regex/1.5.4 \
crate://crates.io/regex/1.5.5 \
crate://crates.io/remove_dir_all/0.5.3 \
crate://crates.io/rpassword/4.0.5 \
crate://crates.io/rustc-demangle/0.1.20 \
crate://crates.io/rustc-demangle/0.1.21 \
crate://crates.io/rustc_version/0.3.3 \
crate://crates.io/same-file/1.0.6 \
crate://crates.io/scoped-tls/1.0.0 \
crate://crates.io/semver-parser/0.10.2 \
crate://crates.io/semver/0.11.0 \
crate://crates.io/serde/1.0.126 \
crate://crates.io/serde_derive/1.0.126 \
crate://crates.io/serde_repr/0.1.7 \
crate://crates.io/sha-1/0.9.6 \
crate://crates.io/sha1/0.6.0 \
crate://crates.io/sha2/0.9.5 \
crate://crates.io/serde/1.0.137 \
crate://crates.io/serde_derive/1.0.137 \
crate://crates.io/serde_repr/0.1.8 \
crate://crates.io/sha-1/0.9.8 \
crate://crates.io/sha1/0.6.1 \
crate://crates.io/sha1_smol/1.0.0 \
crate://crates.io/sha2/0.9.9 \
crate://crates.io/signal-hook-registry/1.4.0 \
crate://crates.io/signal-hook/0.1.17 \
crate://crates.io/signature/1.3.1 \
crate://crates.io/slab/0.4.3 \
crate://crates.io/slotmap/1.0.5 \
crate://crates.io/smallvec/1.6.1 \
crate://crates.io/socket2/0.4.0 \
crate://crates.io/signature/1.5.0 \
crate://crates.io/slab/0.4.6 \
crate://crates.io/slotmap/1.0.6 \
crate://crates.io/smallvec/1.8.0 \
crate://crates.io/socket2/0.4.4 \
crate://crates.io/sodiumoxide/0.2.7 \
crate://crates.io/stable_deref_trait/1.2.0 \
crate://crates.io/static_assertions/1.1.0 \
@ -207,28 +205,29 @@ SRC_URI += " \
crate://crates.io/strum_macros/0.21.1 \
crate://crates.io/subtle/2.4.1 \
crate://crates.io/syn/0.15.44 \
crate://crates.io/syn/1.0.73 \
crate://crates.io/synstructure/0.12.5 \
crate://crates.io/syn/1.0.95 \
crate://crates.io/synstructure/0.12.6 \
crate://crates.io/system-deps/1.3.2 \
crate://crates.io/system-deps/3.2.0 \
crate://crates.io/tempfile/3.2.0 \
crate://crates.io/tempfile/3.3.0 \
crate://crates.io/termion/1.5.6 \
crate://crates.io/textwrap/0.11.0 \
crate://crates.io/thiserror-impl/1.0.26 \
crate://crates.io/thiserror/1.0.26 \
crate://crates.io/thiserror-impl/1.0.31 \
crate://crates.io/thiserror/1.0.31 \
crate://crates.io/time/0.1.43 \
crate://crates.io/toml/0.4.10 \
crate://crates.io/toml/0.5.8 \
crate://crates.io/typenum/1.13.0 \
crate://crates.io/toml/0.5.9 \
crate://crates.io/typenum/1.15.0 \
crate://crates.io/ucd-trie/0.1.3 \
crate://crates.io/unicode-segmentation/1.8.0 \
crate://crates.io/unicode-width/0.1.8 \
crate://crates.io/unicode-ident/1.0.0 \
crate://crates.io/unicode-segmentation/1.9.0 \
crate://crates.io/unicode-width/0.1.9 \
crate://crates.io/unicode-xid/0.1.0 \
crate://crates.io/unicode-xid/0.2.2 \
crate://crates.io/unicode-xid/0.2.3 \
crate://crates.io/vec_map/0.8.2 \
crate://crates.io/version-compare/0.0.10 \
crate://crates.io/version-compare/0.0.11 \
crate://crates.io/version_check/0.9.3 \
crate://crates.io/version_check/0.9.4 \
crate://crates.io/void/1.0.2 \
crate://crates.io/waker-fn/1.1.0 \
crate://crates.io/walkdir/2.3.2 \
@ -242,8 +241,8 @@ SRC_URI += " \
crate://crates.io/xi-unicode/0.1.0 \
crate://crates.io/zbus/2.0.0-beta.5 \
crate://crates.io/zbus_macros/2.0.0-beta.5 \
crate://crates.io/zvariant/2.7.0 \
crate://crates.io/zvariant_derive/2.7.0 \
crate://crates.io/zvariant/2.10.0 \
crate://crates.io/zvariant_derive/2.10.0 \
"
export SODIUM_USE_PKG_CONFIG = "1"
@ -252,11 +251,11 @@ DEPENDS = "libsodium openssl dbus gtk+3 glib-2.0 acl"
BBCLASSEXTEND = "native"
PACKAGES =+ "${PN}-realms ${PN}-tools ${PN}-mkimage ${PN}-boot"
FILES_${PN}-realms = "${bindir}/realms"
FILES_${PN}-mkimage = "${bindir}/citadel-mkimage"
FILES_${PN}-boot = "${libexecdir}/citadel-boot"
FILES:${PN}-realms = "${bindir}/realms"
FILES:${PN}-mkimage = "${bindir}/citadel-mkimage"
FILES:${PN}-boot = "${libexecdir}/citadel-boot"
FILES_${PN} = "\
FILES:${PN} = "\
${libexecdir}/citadel-tool \
${libexecdir}/citadel-boot \
${libexecdir}/citadel-run \
@ -274,7 +273,7 @@ FILES_${PN} = "\
${datadir}/applications \
"
SYSTEMD_SERVICE_${PN} = "citadel-current-watcher.path citadel-realmsd.service citadel-boot-automount.service"
SYSTEMD_SERVICE:${PN} = "citadel-current-watcher.path citadel-realmsd.service citadel-boot-automount.service"
TARGET_BIN = "${B}/target/${CARGO_TARGET_SUBDIR}"

4
meta-citadel/recipes-desktop/base16-vim/base16-vim.bb
View File

@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=e6faad78a557b22780e4cf62c89976f8"
SECTION = ""
DEPENDS = ""
SRC_URI = "git://github.com/chriskempson/base16-vim;protocol=https"
SRC_URI = "git://github.com/chriskempson/base16-vim;protocol=https;branch=master"
SRCREV = "6191622d5806d4448fa2285047936bdcee57a098"
FILES_${PN} = "${datadir}/vim/colors"
FILES:${PN} = "${datadir}/vim/colors"
S = "${WORKDIR}/git"
inherit allarch

6
meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_40.bb
View File

@ -1,13 +1,13 @@
LICENSE = "GPLv2"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855"
SRC_URI = "git://github.com/home-sweet-gnome/dash-to-panel.git;protocol=https"
SRC_URI = "git://github.com/home-sweet-gnome/dash-to-panel.git;protocol=https;branch=master"
SRCREV = "48a69e529614d1da456802b818e7d7f0d4d1d642"
S = "${WORKDIR}/git"
DEPENDS = "gettext-native glib-2.0-native"
FILES_${PN} = "${datadir}/gnome-shell/extensions"
FILES:${PN} = "${datadir}/gnome-shell/extensions"
do_configure () {
:

8
meta-citadel/recipes-desktop/gnome-shell-extension-drive-menu/gnome-shell-extension-drive-menu_01.bb
View File

@ -1,18 +1,18 @@
LICENSE = "GPLv2"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=4cb3a392cbf81a9e685ec13b88c4c101"
SRC_URI = "git://github.com/subgraph/gnome-shell-extension-drive-menu.git;protocol=https"
SRC_URI = "git://github.com/subgraph/gnome-shell-extension-drive-menu.git;protocol=https;branch=master"
SRCREV="45bbb0e9fe87f1f44d3eec49f31a1efa835f4f6b"
S = "${WORKDIR}/git"
DEPENDS = "gettext-native glib-2.0-native ninja-native"
FILES_${PN} = "${datadir}/gnome-shell/extensions"
FILES:${PN} = "${datadir}/gnome-shell/extensions"
EXTRA_OEMESON += "--prefix=${D}/usr"
inherit meson
do_configure_prepend () {
do_configure:prepend () {
cd ${S}
./meson-gse/meson-gse
}

6
meta-citadel/recipes-desktop/paper-icon-theme/paper-icon-theme_1.5.bb
View File

@ -3,7 +3,7 @@ LICENSE = "CC-BY-SA-4.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=8335471e369a410f354d5179fdcf0195 \
file://LICENSE;md5=4a312f184ff2ceafe9466cbb7ea43f4e"
SRC_URI = "git://github.com/snwh/paper-icon-theme.git;protocol=https \
SRC_URI = "git://github.com/snwh/paper-icon-theme.git;protocol=https;branch=master \
file://index.theme \
"
SRCREV = "7860fba850fc7f9aed83b1abd804169e816005cd"
@ -12,10 +12,10 @@ S = "${WORKDIR}/git"
inherit meson allarch
FILES_${PN} = "${datadir}/icons"
FILES:${PN} = "${datadir}/icons"
# Add an index.theme to /usr/share/icons/default that inherits Paper cursors
do_install_append() {
do_install:append() {
mkdir -p ${D}${datadir}/icons/default
install -m 644 ${WORKDIR}/index.theme ${D}${datadir}/icons/default/index.theme
}

30
meta-citadel/recipes-desktop/ttf-dejavu/ttf-dejavu_2.37.bb
View File

@ -6,13 +6,13 @@ LICENSE = "BitstreamVera"
LIC_FILES_CHKSUM = "file://../LICENSE;md5=449b2c30bfe5fa897fe87b8b70b16cfa"
# all subpackages except ${PN}-common itself rdepends on ${PN}-common
RDEPENDS_${PN}-sans = "${PN}-common"
RDEPENDS_${PN}-sans-mono = "${PN}-common"
RDEPENDS_${PN}-sans-condensed = "${PN}-common"
RDEPENDS_${PN}-serif = "${PN}-common"
RDEPENDS_${PN}-serif-condensed = "${PN}-common"
RDEPENDS_${PN}-mathtexgyre = "${PN}-common"
RDEPENDS_${PN}-common = ""
RDEPENDS:${PN}-sans = "${PN}-common"
RDEPENDS:${PN}-sans-mono = "${PN}-common"
RDEPENDS:${PN}-sans-condensed = "${PN}-common"
RDEPENDS:${PN}-serif = "${PN}-common"
RDEPENDS:${PN}-serif-condensed = "${PN}-common"
RDEPENDS:${PN}-mathtexgyre = "${PN}-common"
RDEPENDS:${PN}-common = ""
PR = "r7"
SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-fonts-ttf-${PV}.tar.bz2 \
@ -20,7 +20,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-fonts-ttf-${PV}.tar.bz2 \
S = "${WORKDIR}/dejavu-fonts-ttf-${PV}/ttf"
do_install_append () {
do_install:append () {
install -d ${D}${sysconfdir}/fonts/conf.d/
install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
}
@ -35,13 +35,13 @@ PACKAGES = "\
${PN}-common"
FONT_PACKAGES = "${PN}-sans ${PN}-sans-mono ${PN}-sans-condensed ${PN}-serif ${PN}-serif-condensed ${PN}-mathtexgyre"
FILES_${PN}-sans = "${datadir}/fonts/truetype/DejaVuSans.ttf ${datadir}/fonts/truetype/DejaVuSans-*.ttf"
FILES_${PN}-sans-mono = "${datadir}/fonts/truetype/DejaVuSansMono*.ttf"
FILES_${PN}-sans-condensed = "${datadir}/fonts/truetype/DejaVuSansCondensed*.ttf"
FILES_${PN}-serif = "${datadir}/fonts/truetype/DejaVuSerif.ttf ${datadir}/fonts/truetype/DejaVuSerif-*.ttf"
FILES_${PN}-serif-condensed = "${datadir}/fonts/truetype/DejaVuSerifCondensed*.ttf"
FILES_${PN}-mathtexgyre = "${datadir}/fonts/truetype/DejaVuMathTeXGyre.ttf"
FILES_${PN}-common = "${sysconfdir}"
FILES:${PN}-sans = "${datadir}/fonts/truetype/DejaVuSans.ttf ${datadir}/fonts/truetype/DejaVuSans-*.ttf"
FILES:${PN}-sans-mono = "${datadir}/fonts/truetype/DejaVuSansMono*.ttf"
FILES:${PN}-sans-condensed = "${datadir}/fonts/truetype/DejaVuSansCondensed*.ttf"
FILES:${PN}-serif = "${datadir}/fonts/truetype/DejaVuSerif.ttf ${datadir}/fonts/truetype/DejaVuSerif-*.ttf"
FILES:${PN}-serif-condensed = "${datadir}/fonts/truetype/DejaVuSerifCondensed*.ttf"
FILES:${PN}-mathtexgyre = "${datadir}/fonts/truetype/DejaVuMathTeXGyre.ttf"
FILES:${PN}-common = "${sysconfdir}"
SRC_URI[md5sum] = "d0efec10b9f110a32e9b8f796e21782c"
SRC_URI[sha256sum] = "fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7"

2
meta-citadel/recipes-desktop/ttf-roboto/ttf-roboto.bb
View File

@ -11,7 +11,7 @@ inherit allarch fontcache
S = "${WORKDIR}/roboto-hinted"
FILES_${PN} = "${datadir}/fonts/TTF"
FILES:${PN} = "${datadir}/fonts/TTF"
do_install () {
install -Dm644 ${S}/*.ttf -t ${D}${datadir}/fonts/TTF

4
meta-citadel/recipes-initrd/citadel-initramfs/citadel-initramfs.bb
View File

@ -48,9 +48,9 @@ do_install() {
mknod -m 644 ${D}/dev/loop0 b 7 0
}
FILES_${PN} += "/dev/console /boot /dev /usr /etc /proc /run /sys /tmp"
FILES:${PN} += "/dev/console /boot /dev /usr /etc /proc /run /sys /tmp"
pkg_postinst_${PN}() {
pkg_postinst:${PN}() {
ln -sf initrd-release $D${sysconfdir}/os-release
ln -sf ${systemd_system_unitdir}/initrd.target $D${systemd_system_unitdir}/default.target
> $D${sysconfdir}/fstab

6
meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.15.8.bb
View File

@ -1,5 +1,5 @@
DESCRIPTION = "Citadel linux kernel"
LICENSE = "GPLv2"
LICENSE = "GPL-2.0-only"
SECTION = "kernel"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
@ -18,7 +18,7 @@ KERNEL_CONFIG_COMMAND = "oe_runmake_call -C ${S} CC="${KERNEL_CC}" O=${B} olddef
DEPENDS += "lz4-native"
do_deploy_append() {
do_deploy:append() {
rm ${DEPLOYDIR}/bzImage
ln -sf bzImage-initramfs-${KERNEL_IMAGE_NAME}.bin ${DEPLOYDIR}/bzImage
echo "${PV}" > ${DEPLOYDIR}/kernel.version
@ -40,5 +40,5 @@ copy_initramfs() {
}
# Don't install kernel into images, see kernel.bbclass
RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""

4
meta-citadel/recipes-kernel/sof-firmware/sof-firmware.bb
View File

@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/thesofproject"
SECTION = "kernel"
SRCREV = "082fb0673f8488717c431801e4bc061d0dc2051c"
SRC_URI = "git://github.com/thesofproject/sof-bin.git;branch=main;protocol=git;destsuffix=sof-firmware"
SRC_URI = "git://github.com/thesofproject/sof-bin.git;branch=main;protocol=https;destsuffix=sof-firmware"
S = "${WORKDIR}"
@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://sof-firmware/LICENCE.Intel;md5=54b4f1a2dd35fd85bc7a1d
PV = "1.9"
FILES_${PN} += "/usr/lib/firmware/intel/*"
FILES:${PN} += "/usr/lib/firmware/intel/*"
inherit allarch update-alternatives

6
meta-citadel/recipes-support/cryptsetup/cryptsetup_2.3.6.bb
View File

@ -37,7 +37,7 @@ PACKAGECONFIG ??= " \
luks-adjust-xts-keysize \
openssl \
"
PACKAGECONFIG_append:class-target = " \
PACKAGECONFIG:append:class-target = " \
udev \
"
@ -77,11 +77,11 @@ EXTRA_OECONF += "--disable-libargon2"
FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}"
RDEPENDS_${PN} = " \
RDEPENDS:${PN} = " \
libdevmapper \
"
RRECOMMENDS_${PN}:class-target = " \
RRECOMMENDS:${PN}:class-target = " \
kernel-module-aes-generic \
kernel-module-dm-crypt \
kernel-module-md5 \

10
meta-citadel/recipes-support/keyutils/keyutils_1.6.1.bb
View File

@ -7,7 +7,7 @@ DESCRIPTION = "\
HOMEPAGE = "http://people.redhat.com/dhowells/keyutils"
SECTION = "base"
LICENSE = "LGPLv2.1+ & GPLv2.0+"
LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45 \
file://LICENCE.LGPL;md5=7d1cacaa3ea752b72ea5e525df54a21f"
@ -40,7 +40,7 @@ do_install () {
oe_runmake DESTDIR=${D} install
}
do_install_append_class-nativesdk() {
do_install:append:class-nativesdk() {
install -d ${D}${datadir}
src_dir="${D}${target_datadir}"
mv $src_dir/* ${D}${datadir}
@ -58,8 +58,8 @@ do_install_ptest () {
}
RDEPENDS_${PN}-ptest += "lsb-release"
RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils"
RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils"
RDEPENDS:${PN}-ptest += "lsb-release"
RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils"
RDEPENDS:${PN}-ptest:append:libc-musl = " musl-utils"
BBCLASSEXTEND = "native nativesdk"

8
meta-citadel/recipes-support/libatasmart/libatasmart_0.19.bb
View File

@ -1,19 +1,19 @@
SUMMARY = "ATA S.M.A.R.T. Reading and Parsing Library"
LICENSE = "LGPLv2.1"
LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "udev"
SRCREV = "de6258940960443038b4c1651dfda3620075e870"
SRC_URI = "git://git.0pointer.de/libatasmart.git"
SRC_URI = "git://git.0pointer.de/libatasmart.git;branch=master"
S = "${WORKDIR}/git"
inherit autotools lib_package pkgconfig
do_install_append() {
do_install:append() {
sed -i -e s://:/:g -e 's:=${libdir}/libudev.la:-ludev:g' ${D}${libdir}/libatasmart.la
}
PACKAGES =+ "${PN}-dev-vala"
FILES_${PN}-dev-vala = "${datadir}/vala"
FILES:${PN}-dev-vala = "${datadir}/vala"

6
meta-citadel/recipes-support/libblockdev/libblockdev_2.26.bb
View File

@ -3,18 +3,18 @@ block devices. It has a plugin-based architecture where each technology (like \
LVM, Btrfs, MD RAID, Swap,...) is implemented in a separate plugin, possibly \
with multiple implementations (e.g. using LVM CLI or the new LVM DBus API)."
HOMEPAGE = "http://rhinstaller.github.io/libblockdev/"
LICENSE = "LGPLv2+"
LICENSE = "LGPL-2.0-or-later"
SECTION = "devel/lib"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c"
inherit autotools gobject-introspection pkgconfig
SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch"
SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch;protocol=https"
SRCREV = "47ff12242c89e36a33259d18b7068b26c3bb1c64"
S = "${WORKDIR}/git"
FILES_${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.*/site-packages"
FILES:${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.*/site-packages"
PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath nvdimm"
PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3"

6
meta-citadel/recipes-support/libbytesize/libbytesize_2.6.bb
View File

@ -1,7 +1,7 @@
DESCRIPTION = "The goal of this project is to provide a tiny library that would \
facilitate the common operations with sizes in bytes."
HOMEPAGE = "https://github.com/rhinstaller/libbytesize"
LICENSE = "LGPLv2+"
LICENSE = "LGPL-2.0-or-later"
SECTION = "devel/lib"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c"
@ -10,7 +10,7 @@ S = "${WORKDIR}/git"
B = "${S}"
SRCREV = "c9864f4dd03736839f40d225da494cb1eb64e654"
SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master"
SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master;protocol=https"
inherit gettext autotools pkgconfig python3native
@ -21,7 +21,7 @@ DEPENDS += " \
gettext-native \
"
FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize"
FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize"
PACKAGECONFIG ??= "python3"
PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3-core"

8
meta-citadel/recipes-support/libpam-pwdfile/libpam-pwdfile_1.0.bb
View File

@ -1,10 +1,10 @@
SUMMARY = "PAM pwdfile library"
SECTION = "libs"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://pam_pwdfile.c;beginline=1;endline=39;md5=02765d16df913d327ffd4a2ef499baf4"
SRC_URI = "git://github.com/tiwe-de/libpam-pwdfile.git;protocol=https"
SRC_URI = "git://github.com/tiwe-de/libpam-pwdfile.git;protocol=https;branch=master"
SRCREV = "8f0e412b48178c00abd023917dd2c9050ee89c18"
S = "${WORKDIR}/git"
@ -12,7 +12,7 @@ S = "${WORKDIR}/git"
DEPENDS = "libpam libxcrypt"
inherit lib_package pkgconfig
FILES_${PN} += "${libdir}/security/pam_pwdfile.so"
FILES:${PN} += "${libdir}/security/pam_pwdfile.so"
do_compile_class() {
oe_runmake CC_FOR_BUILD="${BUILD_CC}" PAM_LIB_DIR=${libdir}/security

2
meta-citadel/recipes-support/libsass/libsass_3.5.5.bb
View File

@ -3,7 +3,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d \
file://LICENSE;md5=2f8a76980411a3f1f1480b141ce06744"
SRC_URI = "git://github.com/sass/libsass.git;protocol=git;branch=3.5-stable"
SRC_URI = "git://github.com/sass/libsass.git;protocol=https;branch=3.5-stable"
SRCREV = "39e30874b9a5dd6a802c20e8b0470ba44eeba929"
S = "${WORKDIR}/git"

4
meta-citadel/recipes-support/libseccomp/files/run-ptest
View File

@ -1,4 +0,0 @@
#!/bin/sh
cd tests
./regression -a

54
meta-citadel/recipes-support/libseccomp/libseccomp_2.5.1.bb
View File

@ -1,54 +0,0 @@
SUMMARY = "interface to seccomp filtering mechanism"
DESCRIPTION = "The libseccomp library provides and easy to use, platform independent,interface to the Linux Kernel's syscall filtering mechanism: seccomp."
HOMEPAGE = "https://github.com/seccomp/libseccomp"
SECTION = "security"
LICENSE = "LGPL-2.1"
LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357ceb8e7c37f989f"
DEPENDS += "gperf-native"
SRCREV = "4bf70431a339a2886ab8c82e9a45378f30c6e6c7"
SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5 \
file://run-ptest \
"
COMPATIBLE_HOST_riscv32 = "null"
S = "${WORKDIR}/git"
inherit autotools-brokensep pkgconfig ptest features_check
REQUIRED_DISTRO_FEATURES = "seccomp"
PACKAGECONFIG ??= ""
PACKAGECONFIG[python] = "--enable-python, --disable-python, python3"
DISABLE_STATIC = ""
do_compile_ptest() {
oe_runmake -C tests check-build
}
do_install_ptest() {
install -d ${D}${PTEST_PATH}/tests
install -d ${D}${PTEST_PATH}/tools
for file in $(find tests/* -executable -type f); do
install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests
done
for file in $(find tests/*.tests -type f); do
install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests
done
for file in $(find tools/* -executable -type f); do
install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools
done
# Overwrite libtool wrappers with real executables
for file in $(find tools/.libs/* -executable -type f); do
install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools
done
}
FILES_${PN} = "${bindir} ${libdir}/${BPN}.so*"
FILES_${PN}-dbg += "${libdir}/${PN}/tests/.debug/* ${libdir}/${PN}/tools/.debug"
RDEPENDS_${PN}-ptest = "coreutils bash"

4
meta-citadel/recipes-support/lvm2/lvm2.inc
View File

@ -1,7 +1,7 @@
HOMEPAGE = "https://www.sourceware.org/lvm2/"
SECTION = "utils"
DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux."
LICENSE = "GPLv2 & LGPLv2.1"
LICENSE = "GPL-2.0-only & LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \
file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24"
@ -24,7 +24,7 @@ S = "${WORKDIR}/git"
inherit autotools-brokensep pkgconfig systemd
LVM2_PACKAGECONFIG = "dmeventd"
LVM2_PACKAGECONFIG_append_class-target = " \
LVM2_PACKAGECONFIG:append:class-target = " \
${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
"

30
meta-citadel/recipes-support/lvm2/lvm2_2.03.11.bb
View File

@ -12,7 +12,7 @@ MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf"
CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe"
do_install_append() {
do_install:append() {
# Install machine specific configuration file
install -d ${D}${sysconfdir}/lvm
install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf
@ -30,33 +30,33 @@ do_install_append() {
PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules"
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \
SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \
blk-availability.service"
SYSTEMD_AUTO_ENABLE = "disable"
TARGET_CC_ARCH += "${LDFLAGS}"
EXTRA_OECONF_append_class-nativesdk = " --with-confdir=${sysconfdir}"
EXTRA_OECONF:append:class-nativesdk = " --with-confdir=${sysconfdir}"
DEPENDS += "util-linux"
LVM2_PACKAGECONFIG_append_class-target = " \
LVM2_PACKAGECONFIG:append:class-target = " \
udev \
"
PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules"
PACKAGES =+ "libdevmapper"
FILES_libdevmapper = " \
FILES:libdevmapper = " \
${libdir}/libdevmapper.so.* \
${sbindir}/dmsetup \
${sbindir}/dmstats \
"
FILES_${PN} += " \
FILES:${PN} += " \
${libdir}/device-mapper/*.so \
${systemd_system_unitdir}/lvm2-pvscan@.service \
"
FILES_${PN}-scripts = " \
FILES:${PN}-scripts = " \
${sbindir}/blkdeactivate \
${sbindir}/fsadm \
${sbindir}/lvmconf \
@ -64,22 +64,22 @@ FILES_${PN}-scripts = " \
"
# Specified explicitly for the udev rules, just in case that it does not get picked
# up automatically:
FILES_${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
RDEPENDS_${PN}-udevrules = "libdevmapper"
RDEPENDS_${PN}_append_class-target = " libdevmapper"
RDEPENDS_${PN}_append_class-nativesdk = " libdevmapper"
FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
RDEPENDS:${PN}-udevrules = "libdevmapper"
RDEPENDS:${PN}:append:class-target = " libdevmapper"
RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"
RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \
RDEPENDS:${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \
bash \
util-linux-lsblk \
util-linux-findmnt \
coreutils \
"
RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})"
RRECOMMENDS:${PN}:class-target = "${PN}-scripts (= ${EXTENDPKGV})"
CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf"
CONFFILES:${PN} += "${sysconfdir}/lvm/lvm.conf"
SYSROOT_PREPROCESS_FUNCS_append = " remove_libdevmapper_sysroot_preprocess"
SYSROOT_PREPROCESS_FUNCS:append = " remove_libdevmapper_sysroot_preprocess"
remove_libdevmapper_sysroot_preprocess() {
rm -f ${SYSROOT_DESTDIR}${libdir}/libdevmapper.so* \
${SYSROOT_DESTDIR}${sbindir}/dmsetup \

6
meta-citadel/recipes-support/mkpasswd/mkpasswd_5.5.7.bb
View File

@ -1,13 +1,13 @@
LICENSE = "GPLv2"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/rfc1036/whois.git;protocol=https"
SRC_URI = "git://github.com/rfc1036/whois.git;protocol=https;branch=master"
SRCREV = "7f9fdae2a99c9a56959b37049488f94e8bdfa7c2"
S = "${WORKDIR}/git"
DEPENDS = "libxcrypt libidn2"
RDEPENDS_${PN} = "libxcrypt libidn2"
RDEPENDS:${PN} = "libxcrypt libidn2"
inherit pkgconfig gettext
do_compile() {

4
meta-citadel/recipes-support/nano/nano_5.8.bb
View File

@ -4,11 +4,11 @@ Not ANOther editor) is an enhanced clone of the \
Pico text editor."
HOMEPAGE = "http://www.nano-editor.org/"
SECTION = "console/utils"
LICENSE = "GPLv3"
LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
DEPENDS = "ncurses file"
RDEPENDS_${PN} = "ncurses-terminfo-base"
RDEPENDS:${PN} = "ncurses-terminfo-base"
PV_MAJOR = "${@d.getVar('PV').split('.')[0]}"

8
meta-citadel/recipes-support/nnn/nnn_2.4.bb → meta-citadel/recipes-support/nnn/nnn_4.5.bb
View File

@ -3,15 +3,15 @@ SUMMARY = "Small command line file manager"
HOMEPAGE = "https://github.com/jarun/nnn"
SECTION = "base"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=172009f55dfd36284e707e6c251c14c3"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=ee18574190d1b9d7ce45445955af2c9b"
DEPENDS = "ncurses readline"
inherit pkgconfig
SRCREV = "40b98e8c9e78f8e1622968014ed903aeac8a790e"
SRC_URI = "git://github.com/jarun/nnn.git;protocol=https"
SRCREV = "3f58f6111c95a38f2bfbdde92c42bf54edeb5927"
SRC_URI = "git://github.com/jarun/nnn.git;protocol=https;branch=master"
S = "${WORKDIR}/git"
EXTRA_OEMAKE = "'PREFIX=/usr'"

16
meta-citadel/recipes-support/nspr/nspr_4.29.bb
View File

@ -1,6 +1,6 @@
SUMMARY = "Netscape Portable Runtime Library"
HOMEPAGE = "http://www.mozilla.org/projects/nspr/"
LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1"
LICENSE = "GPL-2.0-only | MPL-2.0 | LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \
file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99"
SECTION = "libs/network"
@ -15,7 +15,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz
file://nspr.pc.in \
"
CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \
CACHED_CONFIGUREVARS:append:libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \
-D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \
-D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \
-D_PR_INET6_PROBE -DNO_DLOPEN_NULL'"
@ -30,7 +30,7 @@ CVE_PRODUCT = "netscape_portable_runtime"
S = "${WORKDIR}/nspr-${PV}/nspr"
RDEPENDS_${PN}-dev += "perl"
RDEPENDS:${PN}-dev += "perl"
TARGET_CC_ARCH += "${LDFLAGS}"
TESTS = " \
@ -160,15 +160,15 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
# preferred path upstream.
EXTRA_OECONF += "--includedir=${includedir}/nspr"
do_compile_prepend() {
do_compile:prepend() {
oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export
}
do_compile_append() {
do_compile:append() {
oe_runmake -C pr/tests
}
do_install_append() {
do_install:append() {
install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc
sed -i \
-e 's:NSPRVERSION:${PV}:g' \
@ -190,8 +190,8 @@ do_install_append() {
rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties
}
FILES_${PN} = "${libdir}/lib*.so"
FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \
FILES:${PN} = "${libdir}/lib*.so"
FILES:${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \
${includedir}/* ${datadir}/aclocal/* "
BBCLASSEXTEND = "native nativesdk"

32
meta-citadel/recipes-support/nss/nss_3.64.bb
View File

@ -11,7 +11,7 @@ SECTION = "libs"
DEPENDS = "sqlite3 nspr zlib nss-native"
DEPENDS_class-native = "sqlite3-native nspr-native zlib-native"
LICENSE = "(MPL-2.0 & MIT) | (MPL-2.0 & GPL-2.0+ & MIT) | (MPL-2.0 & LGPL-2.1+ & MIT)"
LICENSE = "(MPL-2.0 & MIT) | (MPL-2.0 & GPL-2.0-or-later & MIT) | (MPL-2.0 & LGPL-2.1-or-later & MIT)"
LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \
file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \
@ -45,32 +45,32 @@ TDS = "${S}/tentative-dist-staging"
# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a
# which caused -march conflicts in gcc
TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto"
TUNE_CCARGS:remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto"
TARGET_CC_ARCH += "${LDFLAGS}"
do_configure_prepend_libc-musl () {
do_configure:prepend:libc-musl () {
sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk
}
do_configure_prepend_powerpc64le_toolchain-clang () {
do_configure:prepend:powerpc64le:toolchain-clang () {
sed -i -e 's/\-std=c99/\-std=gnu99/g' ${S}/nss/coreconf/command.mk
}
do_configure_prepend_powerpc64_toolchain-clang () {
do_configure:prepend:powerpc64:toolchain-clang () {
sed -i -e 's/\-std=c99/\-std=gnu99/g' ${S}/nss/coreconf/command.mk
}
do_compile_prepend_class-native() {
do_compile:prepend:class-native() {
export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr
export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE}
}
do_compile_prepend_class-nativesdk() {
do_compile:prepend:class-nativesdk() {
export LDFLAGS=""
}
do_compile_prepend_class-native() {
do_compile:prepend:class-native() {
# Need to set RPATH so that chrpath will do its job correctly
RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}"
}
@ -139,7 +139,7 @@ do_compile() {
do_compile[vardepsexclude] += "SITEINFO_BITS"
do_install_prepend_class-nativesdk() {
do_install:prepend:class-nativesdk() {
export LDFLAGS=""
}
@ -216,7 +216,7 @@ do_install() {
do_install[vardepsexclude] += "SITEINFO_BITS"
do_install_append() {
do_install:append() {
# Create empty .chk files for the NSS libraries at build time. They could
# be regenerated at target's boot time.
for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do
@ -232,7 +232,7 @@ do_install_append() {
sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc
}
do_install_append_class-target() {
do_install:append:class-target() {
# It used to call certutil to create a blank certificate with empty password at
# build time, but the checksum of key4.db changes every time when certutil is called.
# It causes non-determinism issue, so provide databases with a blank certificate
@ -247,7 +247,7 @@ do_install_append_class-target() {
PACKAGE_WRITE_DEPS += "nss-native"
pkg_postinst_${PN} () {
pkg_postinst:${PN} () {
for I in $D${libdir}/lib*.chk; do
DN=`dirname $I`
BN=`basename $I .chk`
@ -260,23 +260,23 @@ pkg_postinst_${PN} () {
}
PACKAGES =+ "${PN}-smime"
FILES_${PN}-smime = "\
FILES:${PN}-smime = "\
${bindir}/smime \
"
FILES_${PN} = "\
FILES:${PN} = "\
${sysconfdir} \
${bindir} \
${libdir}/lib*.chk \
${libdir}/lib*.so \
"
FILES_${PN}-dev = "\
FILES:${PN}-dev = "\
${libdir}/nss \
${libdir}/pkgconfig/* \
${includedir}/* \
"
RDEPENDS_${PN}-smime = "perl"
RDEPENDS:${PN}-smime = "perl"
BBCLASSEXTEND = "native nativesdk"

2
meta-citadel/recipes-support/sassc/sassc_3.5.0.bb
View File

@ -1,7 +1,7 @@
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=2f8a76980411a3f1f1480b141ce06744"
SRC_URI = "git://github.com/sass/sassc.git;protocol=git"
SRC_URI = "git://github.com/sass/sassc.git;protocol=https;branch=master"
SRCREV = "aa6d5c635ea8faf44d542a23aaf85d27e5777d48"
S = "${WORKDIR}/git"

16
meta-citadel/recipes-support/udisks/udisks2_2.9.3.bb
View File

@ -1,5 +1,5 @@
SUMMARY = "udisks provides dbus interfaces for disks and storage devices"
LICENSE = "GPLv2+ & LGPLv2+"
LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43"
DEPENDS = " \
@ -15,9 +15,9 @@ DEPENDS = " \
"
DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
RDEPENDS_${PN} = "acl"
RDEPENDS:${PN} = "acl"
SRC_URI = "git://github.com/storaged-project/udisks.git;branch=2.9.x-branch"
SRC_URI = "git://github.com/storaged-project/udisks.git;branch=2.9.x-branch;protocol=https"
SRCREV = "c430dd9a27e158693cc783e9ee91bf6e5b2a8819"
S = "${WORKDIR}/git"
@ -29,13 +29,13 @@ REQUIRED_DISTRO_FEATURES = "polkit"
EXTRA_OECONF = "--disable-man --disable-gtk-doc"
do_configure_prepend() {
do_configure:prepend() {
# | configure.ac:656: error: required file 'build-aux/config.rpath' not found
mkdir -p ${S}/build-aux
touch ${S}/build-aux/config.rpath
}
FILES_${PN} += " \
FILES:${PN} += " \
${datadir}/dbus-1/ \
${datadir}/polkit-1 \
${datadir}/bash-completion \
@ -46,8 +46,8 @@ FILES_${PN} += " \
"
PACKAGES =+ "${PN}-libs"
FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}"
FILES_${PN} += "${nonarch_libdir}/tmpfiles.d"
FILES:${PN}-libs = "${libdir}/lib*${SOLIBS}"
FILES:${PN} += "${nonarch_libdir}/tmpfiles.d"
SYSTEMD_SERVICE_${PN} = "${BPN}.service"
SYSTEMD_SERVICE:${PN} = "${BPN}.service"
SYSTEMD_AUTO_ENABLE = "disable"

12
meta-citadel/recipes-support/volume-key/volume-key_0.3.12.bb
View File

@ -1,7 +1,7 @@
DESCRIPTION = "The volume_key project provides a libvolume_key, a library for manipulating \
storage volume encryption keys and storing them separately from volumes, and an \
associated command-line tool, named volume_key."
LICENSE = "GPLv2"
LICENSE = "GPL-2.0-only"
SECTION = "devel/lib"
HOMEPAGE = "https://pagure.io/volume_key"
@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "6ca3748fc1dad22c450bbf6601d4e706cb11c5e662d11bb4aeb473a9cd
SRCNAME = "volume_key"
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit autotools python3native gettext
inherit autotools python3native gettext pkgconfig
DEPENDS += " \
util-linux \
@ -28,11 +28,11 @@ DEPENDS += " \
"
PACKAGECONFIG ??= "python3"
PACKAGECONFIG[python] = "--with-python,--without-python,python,python"
PACKAGECONFIG[python3] = "--with-python3,--without-python3,python3,python3"
RDEPENDS_python3-${PN} += "${PN}"
EXTRA_OECONF = "--without-python"
PACKAGES += "python3-${PN}"
FILES_python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/*"
RDEPENDS:python3-${BPN} += "${PN}"
PACKAGES += "python3-${BPN}"
FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/*"

6
meta-citadel/recipes-support/wireguard/wireguard-module_1.0.20210219.bb
View File

@ -2,7 +2,7 @@ require wireguard.inc
SRCREV = "122f06bfd8fc7b06a0899fa9adc4ce8e06900d98"
SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat"
SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat;branch=master"
inherit module kernel-module-split
@ -12,13 +12,13 @@ DEPENDS = "virtual/kernel libmnl"
# configuration options. For exact kernel requirements visit:
# https://www.wireguard.io/install/#kernel-requirements
EXTRA_OEMAKE_append = " \
EXTRA_OEMAKE:append = " \
KERNELDIR=${STAGING_KERNEL_DIR} \
"
MAKE_TARGETS = "module"
RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit"
RRECOMMENDS:${PN} = "kernel-module-xt-hashlimit"
MODULE_NAME = "wireguard"
module_do_install() {

8
meta-citadel/recipes-support/wireguard/wireguard-tools_1.0.20210315.bb
View File

@ -1,7 +1,7 @@
require wireguard.inc
SRCREV = "622408872fd6f3a58e98e88d39d30e98968314fa"
SRC_URI = "git://git.zx2c4.com/wireguard-tools"
SRC_URI = "git://git.zx2c4.com/wireguard-tools;branch=master"
inherit bash-completion systemd pkgconfig
@ -16,11 +16,11 @@ do_install () {
install
}
FILES_${PN} = " \
FILES:${PN} = " \
${sysconfdir} \
${systemd_system_unitdir} \
${bindir} \
"
RDEPENDS_${PN} = "bash"
RRECOMMENDS_${PN} = "kernel-module-wireguard"
RDEPENDS:${PN} = "bash"
RRECOMMENDS:${PN} = "kernel-module-wireguard"

2
meta-citadel/recipes-support/wireguard/wireguard.inc
View File

@ -6,7 +6,7 @@ TLS-based solutions like OpenVPN, while being more secure, more performant, \
and easier to use."
SECTION = "networking"
HOMEPAGE = "https://www.wireguard.io/"
LICENSE = "GPLv2"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"

2
meta-citadel/recipes-sway/grim/grim_1.3.1.bb
View File

@ -4,7 +4,7 @@ inherit meson pkgconfig
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e316e9609dd7672b87ff25b46b2cf3e1"
SRC_URI = "git://github.com/emersion/grim;protocol=https"
SRC_URI = "git://github.com/emersion/grim;protocol=https;branch=master"
UPSTREAM_CHECK_COMMITS = "1"

8
meta-citadel/recipes-sway/gtk-layer-shell/gtk-layer-shell_0.5.1.bb
View File

@ -1,5 +1,5 @@
LICENSE = "LGPLv3 & MIT & GPLv3"
LICENSE = "LGPL-3.0-only & MIT & GPL-3.0-only"
LIC_FILES_CHKSUM = "file://LICENSE_LGPL.txt;md5=3000208d539ec061b899bce1d9ce9404 \
file://LICENSE_MIT.txt;md5=d015f272ca1521139fd99ea64d6e5e23 \
file://LICENSE_GPL.txt;md5=1ebbd3e34237af26da5dc08a4e440464 \
@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE_LGPL.txt;md5=3000208d539ec061b899bce1d9ce9404
file://test/check-licenses.py;md5=3c4fd5f6d979f739fba5d1f020f81e3e"
SRC_URI = "git://github.com/wmww/gtk-layer-shell;protocol=https"
SRC_URI = "git://github.com/wmww/gtk-layer-shell;protocol=https;branch=master"
ERROR_QA_remove = "unknown-configure-option"
GIR_MESON_OPTION = ""
SRCREV = "3b3b935b1643eb58e6cf5a9432b4470d568bfbc2"
UPSTREAM_CHECK_COMMITS = "1"
@ -19,6 +19,6 @@ B = "${WORKDIR}/build"
inherit meson pkgconfig gobject-introspection
DEPENDS = "wlroots wayland wayland-native wayland-protocols glib-2.0 gtk+3"
#DEPENDS_class-native = "wayland-native glib-2.0-native gtk+3-native gtk+3-wayland-native"
#DEPENDS:class-native = "wayland-native glib-2.0-native gtk+3-native gtk+3-wayland-native"
BBCLASSEXTEND = "native nativesdk"

4
meta-citadel/recipes-sway/sgmenu/sgmenu_0.1.0.bb
View File

@ -3,13 +3,13 @@ HOMEPAGE = "http://github.com/subgraph/citadel"
LICENSE = "CLOSED"
LIC_FILES_CHKSUM=""
inherit cargo systemd
inherit cargo systemd pkgconfig
#
# Update this when changes are pushed to github
#
SRCREV = "32b4b0886a2a1872b4b7a2d36236daf0b94578d6"
SRC_URI = "git://github.com/subgraph/sgmenu.git;protocol=https"
SRC_URI = "git://github.com/subgraph/sgmenu.git;protocol=https;branch=master"
S = "${WORKDIR}/git"

2
meta-citadel/recipes-sway/slurp/slurp_1.3.1.bb
View File

@ -4,7 +4,7 @@ inherit meson pkgconfig
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e316e9609dd7672b87ff25b46b2cf3e1"
SRC_URI = "git://github.com/emersion/slurp;protocol=https"
SRC_URI = "git://github.com/emersion/slurp;protocol=https;branch=master"
UPSTREAM_CHECK_COMMITS = "1"
SRCREV = "bfff873301e92364df80ef6aaa4a6b14f76177af"

11
meta-citadel/recipes-sway/sway/sway_1.5.1.bb
View File

@ -6,26 +6,29 @@ SRCREV = "5ae4f65045c04df7ad2d87142b4064803d97a73e"
#PV = "1.4+git${SRCPV}"
S = "${WORKDIR}/git"
SRC_URI = "git://github.com/swaywm/sway;protocol=https \
SRC_URI = "git://github.com/swaywm/sway;protocol=https;branch=master \
file://config \
file://0001-Reinstate-wayland-0-as-starting-display-socket-for-C.patch \
"
UPSTREAM_CHECK_COMMITS = "1"
inherit meson
inherit meson pkgconfig
DEPENDS = "dbus cairo pango wlroots libinput libxkbcommon wayland wayland-native libpam libcap json-c libpcre gdk-pixbuf"
FILES_${PN} += "\
FILES:${PN} += "\
${datadir}/wayland-sessions/sway.desktop \
"
do_install_append() {
do_install:append() {
rm ${D}${sysconfdir}/sway/config
install -m 644 ${WORKDIR}/config ${D}${sysconfdir}/sway/config
}
# Reproducibility issue. Fix me!
CFLAGS:append = " -Wno-error=date-time"
EXTRA_OEMESON += "-Ddefault-wallpaper=false -Dzsh-completions=false -Dbash-completions=false -Dfish-completions=false"

6
meta-citadel/recipes-sway/sway/sway_git.bb
View File

@ -6,7 +6,7 @@ SRCREV = "ab77efc6caba50acc4c87e02ae3e6712ea808772"
PV = "1.4+git${SRCPV}"
S = "${WORKDIR}/git"
SRC_URI = "git://github.com/swaywm/sway;protocol=https \
SRC_URI = "git://github.com/swaywm/sway;protocol=https;branch=master \
file://config \
"
@ -16,11 +16,11 @@ inherit meson
DEPENDS = "dbus cairo pango wlroots libinput libxkbcommon wayland wayland-native libpam libcap json-c libpcre gdk-pixbuf"
FILES_${PN} += "\
FILES:${PN} += "\
${datadir}/wayland-sessions/sway.desktop \
"
do_install_append() {
do_install:append() {
rm ${D}${sysconfdir}/sway/config
install -m 644 ${WORKDIR}/config ${D}${sysconfdir}/sway/config
}

5
meta-citadel/recipes-sway/swaybg/swaybg_git.bb
View File

@ -4,7 +4,7 @@ inherit meson pkgconfig
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b53d9ec16b9125995437ac9efab1b450"
SRC_URI = "git://github.com/swaywm/swaybg;protocol=https"
SRC_URI = "git://github.com/swaywm/swaybg;protocol=https;branch=master"
PV = "1.0+git${SRCPV}"
PR = "r0"
@ -16,4 +16,5 @@ S = "${WORKDIR}/git"
DEPENDS = "wayland wayland-native wayland-protocols cairo gdk-pixbuf"
# Reproducibility issue. Fix me!
CFLAGS:append = " -Wno-error=date-time"

15
meta-citadel/recipes-sway/swaylock/swaylock_1.3.bb
View File

@ -1,15 +0,0 @@
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b53d9ec16b9125995437ac9efab1b450"
SRC_URI = "https://github.com/swaywm/swaylock/archive/${PV}.tar.gz \
"
SRC_URI[md5sum] = "60bb92e6ae639daef955f157e6128efe"
SRC_URI[sha256sum] = "3bf4143136e688af2f31d10c0be26d14e371f31bfceec1d98db88abfe0f7a94c"
DEPENDS = "wlroots libxkbcommon wayland wayland-native libpam gdk-pixbuf cairo"
inherit meson
EXTRA_OEMESON += "-Dbash-completions=false -Dfish-completions=false -Dzsh-completions=false"

46
meta-citadel/recipes-sway/swaylock/swaylock_git.bb Normal file
View File

@ -0,0 +1,46 @@
SUMMARY = "swaylock is a screen locking utility for Wayland compositors."
HOMEPAGE = "https://github.com/swaywm/swaylock"
BUGTRACKER = "https://github.com/swaywm/swaylock/issues"
SECTION = "base/wayland"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b53d9ec16b9125995437ac9efab1b450"
REQUIRED_DISTRO_FEATURES = "wayland"
DEPENDS = " \
cairo \
libxkbcommon \
wayland \
wayland-native \
wayland-protocols \
"
SRC_URI = " \
git://github.com/swaywm/swaylock.git;protocol=https;branch=master \
"
S = "${WORKDIR}/git"
PV = "1.6"
SRCREV = "92de4d2e310c7bd7dca9c9ced602219dc8245a55"
PACKAGECONFIG[pam] = ",,libpam"
PACKAGECONFIG[gdk-pixbuf] = ",,gdk-pixbuf"
PACKAGECONFIG[man-pages] = ",,scdoc-native"
PACKAGECONFIG ?= " \
gdk-pixbuf \
pam \
"
# Reproducibility issue. Fix me!
CFLAGS:append = " -Wno-error=date-time"
inherit meson pkgconfig features_check
EXTRA_OEMESON += "--buildtype release"
FILES:${PN} += "${datadir}"
BBCLASSEXTEND = ""

6
meta-citadel/recipes-sway/wdisplays/wdisplays_git.bb
View File

@ -1,13 +1,13 @@
inherit meson pkgconfig
LICENSE = "GPLv3"
LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
file://LICENSES/GPL-3.0-or-later.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
file://LICENSES/CC0-1.0.txt;md5=6fd064768b8d61c31ddd0540570fbd33 \
file://LICENSES/CC-BY-SA-4.0.txt;md5=4b39cb11ffa11c92d3f7a3431390e0d9"
SRC_URI = "git://github.com/luispabon/wdisplays;protocol=https"
SRC_URI = "git://github.com/luispabon/wdisplays;protocol=https;branch=master"
SRC_URI += "file://use_correct_versions.patch"
PV = "1.0+git${SRCPV}"
@ -21,4 +21,4 @@ S = "${WORKDIR}/git"
DEPENDS = "wayland wayland-native wayland-protocols glib-2.0-native gtk+3 libepoxy"
FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/wdisplays.svg"
FILES:${PN} += "${datadir}/icons/hicolor/scalable/apps/wdisplays.svg"

2
meta-citadel/recipes-sway/wlroots/wlroots_0.12.0.bb
View File

@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7578fad101710ea2d289ff5411f1b818"
SRCREV = "238d1c078fb03338e9f271d98f7bf6b1fc399285"
S = "${WORKDIR}/git"
SRC_URI = "git://github.com/swaywm/wlroots;protocol=https \
SRC_URI = "git://github.com/swaywm/wlroots;protocol=https;branch=master \
"
DEPENDS = "libx11 libdrm dbus libxcb xcb-util-wm xcb-util-image virtual/egl mesa wayland wayland-native libxkbcommon libinput systemd pixman"

1
meta-clang

@ -1 +0,0 @@
Subproject commit 9d276740bd10695e628abdbd49bc4cf36afddf60

10
meta-gnome/classes/gnome-help.bbclass
View File

@ -10,11 +10,11 @@
# pack all help files to ${PN}-help-<lingua>
# Dummy to get yelp build & PACKAGE_NO_HELP_SPLIT set 1
PACKAGES_append = " ${PN}-help"
FILES_${PN}-help = "${datadir}/help"
RRECOMMENDS_${PN}-help = "${@bb.utils.contains('DISTRO_FEATURES','helpfiles','yelp','',d)}"
PACKAGES:append = " ${PN}-help"
FILES:${PN}-help = "${datadir}/help"
RRECOMMENDS:${PN}-help = "${@bb.utils.contains('DISTRO_FEATURES','helpfiles','yelp','',d)}"
do_install_append() {
do_install:append() {
if ${@bb.utils.contains('DISTRO_FEATURES','helpfiles','false','true',d)}; then
rm -rf ${D}${datadir}/help/*
fi
@ -63,5 +63,5 @@ python gnome_do_split_help() {
d.setVar('PACKAGES', ' '.join(packages))
}
PACKAGESPLITFUNCS_prepend = "gnome_do_split_help "
PACKAGESPLITFUNCS:prepend = "gnome_do_split_help "

2
meta-gnome/classes/itstool.bbclass
View File

@ -2,4 +2,4 @@
inherit python3native
DEPENDS_append = " itstool-native"
DEPENDS:append = " itstool-native"

2
meta-gnome/classes/meson-exe-wrapper.bbclass
View File

@ -20,6 +20,6 @@ exe_wrapper = '${B}/wrapper'" > ${WORKDIR}/meson.cross.tmp
fi
}
do_configure_prepend() {
do_configure:prepend() {
setup_wrapper
}

4
meta-gnome/conf/layer.conf
View File

@ -1,7 +1,7 @@
# We have a conf and classes directory, add to BBPATH
BBPATH .= ":${LAYERDIR}"
LAYERSERIES_COMPAT_meta-gnome = "hardknott"
LAYERSERIES_COMPAT_meta-gnome = "kirkstone"
# We have recipes-* directories, add to BBFILES
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
@ -9,4 +9,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
BBFILE_COLLECTIONS += "meta-gnome"
BBFILE_PATTERN_meta-gnome = "^${LAYERDIR}/"
BBFILE_PRIORITY_meta-gnome = "6"
BBFILE_PRIORITY_meta-gnome = "5"

14
meta-gnome/recipes-connectivity/iwd/iwd_1.17.bb
View File

@ -1,6 +1,6 @@
SUMMARY = "Wireless daemon for Linux"
HOMEPAGE = "https://iwd.wiki.kernel.org/"
LICENSE = "LGPL-2.1"
LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
DEPENDS = "ell"
@ -26,29 +26,29 @@ PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--dis
EXTRA_OECONF = "--enable-external-ell"
SYSTEMD_SERVICE_${PN} = " \
SYSTEMD_SERVICE:${PN} = " \
iwd.service \
${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \
"
do_configure_prepend() {
do_configure:prepend() {
install -d ${S}/build-aux
}
do_install_append() {
do_install:append() {
# If client and monitor are disabled, bindir is empty, causing a QA error
rmdir --ignore-fail-on-non-empty ${D}/${bindir}
}
FILES_${PN} += " \
FILES:${PN} += " \
${datadir}/dbus-1 \
${nonarch_libdir}/modules-load.d \
${systemd_unitdir}/network \
"
RDEPENDS_${PN} = "dbus"
RDEPENDS:${PN} = "dbus"
RRECOMMENDS_${PN} = "\
RRECOMMENDS:${PN} = "\
kernel-module-pkcs7-message \
kernel-module-pkcs8-key-parser \
kernel-module-x509-key-parser \

12
meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb
View File

@ -1,7 +1,7 @@
SUMMARY = "ModemManager is a daemon controlling broadband devices/connections"
DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections"
HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/"
LICENSE = "GPL-2.0 & LGPL-2.1"
LICENSE = "GPL-2.0-only & LGPL-2.1-only"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
@ -31,7 +31,7 @@ EXTRA_OECONF = " \
--with-udev-base-dir=${nonarch_base_libdir}/udev \
"
FILES_${PN} += " \
FILES:${PN} += " \
${datadir}/icons \
${datadir}/polkit-1 \
${datadir}/dbus-1 \
@ -40,14 +40,14 @@ FILES_${PN} += " \
${systemd_unitdir}/system \
"
FILES_${PN}-dev += " \
FILES:${PN}-dev += " \
${libdir}/ModemManager/*.la \
"
FILES_${PN}-staticdev += " \
FILES:${PN}-staticdev += " \
${libdir}/ModemManager/*.a \
"
FILES_${PN}-dbg += "${libdir}/ModemManager/.debug"
FILES:${PN}-dbg += "${libdir}/ModemManager/.debug"
SYSTEMD_SERVICE_${PN} = "ModemManager.service"
SYSTEMD_SERVICE:${PN} = "ModemManager.service"

14
meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb
View File

@ -1,7 +1,7 @@
SUMMARY = "NetworkManager-openvpn-plugin"
SECTION = "net/misc"
LICENSE = "GPLv2+"
LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c"
DEPENDS = "dbus dbus-glib networkmanager openvpn intltool-native glib-2.0-native"
@ -18,7 +18,7 @@ S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
# meta-gnome in layers is required using gnome:
PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret"
do_configure_append() {
do_configure:append() {
# network-manager-openvpn.metainfo.xml is created in source folder but
# compile expects it in build folder. As long as nobody comes up with a
# better solution just support build:
@ -28,26 +28,26 @@ do_configure_append() {
fi
}
do_install_append () {
do_install:append () {
rm -rf ${D}${libdir}/NetworkManager/*.la
}
# Create user and group nm-openvpn that are needed since version 1.0.6
USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = "--system nm-openvpn"
USERADD_PARAM:${PN} = "--system nm-openvpn"
FILES_${PN} += " \
FILES:${PN} += " \
${datadir}/dbus-1 \
${datadir}/metainfo \
${libdir}/NetworkManager/*.so \
${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \
"
FILES_${PN}-staticdev += " \
FILES:${PN}-staticdev += " \
${libdir}/NetworkManager/*.a \
"
RDEPENDS_${PN} = " \
RDEPENDS:${PN} = " \
networkmanager \
openvpn \
"

36
meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.32.10.bb
View File

@ -2,7 +2,7 @@ SUMMARY = "NetworkManager"
HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager"
SECTION = "net/misc"
LICENSE = "GPLv2+ & LGPLv2.1+"
LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
"
@ -47,11 +47,11 @@ EXTRA_OECONF = " \
# stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template
# avoids:
# | ../NetworkManager-1.16.0/libnm-core/nm-json.c:106:50: error: 'RTLD_DEEPBIND' undeclared (first use in this function); did you mean 'RTLD_DEFAULT'?
CFLAGS_append_libc-musl = " \
CFLAGS:append:libc-musl = " \
-DRTLD_DEEPBIND=0 \
"
do_compile_prepend() {
do_compile:prepend() {
export GIR_EXTRA_LIBS_PATH="${B}/src/libnm-client-impl/.libs"
}
@ -95,19 +95,19 @@ PACKAGES =+ " \
SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup"
FILES_${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so"
FILES:${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so"
FILES_${PN}-cloud-setup = " \
FILES:${PN}-cloud-setup = " \
${libexecdir}/nm-cloud-setup \
${systemd_system_unitdir}/nm-cloud-setup.service \
${systemd_system_unitdir}/nm-cloud-setup.timer \
${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \
${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \
"
ALLOW_EMPTY_${PN}-cloud-setup = "1"
SYSTEMD_SERVICE_${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}"
ALLOW_EMPTY:${PN}-cloud-setup = "1"
SYSTEMD_SERVICE:${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}"
FILES_${PN} += " \
FILES:${PN} += " \
${libexecdir} \
${libdir}/NetworkManager/${PV}/*.so \
${libdir}/NetworkManager \
@ -126,46 +126,46 @@ FILES_${PN} += " \
${libdir}/pppd \
"
RRECOMMENDS_${PN} += "iptables \
RRECOMMENDS:${PN} += "iptables \
${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \
"
RCONFLICTS_${PN} = "connman"
RCONFLICTS:${PN} = "connman"
FILES_${PN}-dev += " \
FILES:${PN}-dev += " \
${datadir}/NetworkManager/gdb-cmd \
${libdir}/pppd/*/*.la \
${libdir}/NetworkManager/*.la \
${libdir}/NetworkManager/${PV}/*.la \
"
FILES_${PN}-nmcli = " \
FILES:${PN}-nmcli = " \
${bindir}/nmcli \
"
FILES_${PN}-nmcli-doc = " \
FILES:${PN}-nmcli-doc = " \
${mandir}/man1/nmcli* \
"
FILES_${PN}-nmtui = " \
FILES:${PN}-nmtui = " \
${bindir}/nmtui \
${bindir}/nmtui-edit \
${bindir}/nmtui-connect \
${bindir}/nmtui-hostname \
"
FILES_${PN}-nmtui-doc = " \
FILES:${PN}-nmtui-doc = " \
${mandir}/man1/nmtui* \
"
INITSCRIPT_NAME = "network-manager"
SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}"
SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}"
ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}"
ALTERNATIVE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}"
ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv-conf.NetworkManager','',d)}"
ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}"
do_install_append() {
do_install:append() {
install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager
rm -rf ${D}/run ${D}${localstatedir}/run

4
meta-gnome/recipes-devtools/cbindgen/cbindgen_0.8.7.bb
View File

@ -7,11 +7,11 @@ inherit cargo
# how to get cbindgen could be as easy as but default to a git checkout:
# SRC_URI += "crate://crates.io/cbindgen/0.8.7"
SRC_URI += "git://github.com/eqrion/cbindgen.git;protocol=https"
SRC_URI += "git://github.com/eqrion/cbindgen.git;protocol=https;branch=master"
SRCREV = "7b9ea991bdabb442093014d21fde6a192f574f21"
S = "${WORKDIR}/git"
CARGO_SRC_DIR=""
PV_append = ".AUTOINC+7b9ea991bd"
PV:append = ".AUTOINC+7b9ea991bd"
BBCLASSEXTEND = "native"

6
meta-gnome/recipes-devtools/gnome-common/gnome-common_3.18.0.bb
View File

@ -2,7 +2,7 @@ SUMMARY = "Common macros for building GNOME applications"
HOMEPAGE = "http://www.gnome.org/"
BUGTRACKER = "https://bugzilla.gnome.org/"
LICENSE = "GPLv2+"
LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SECTION = "x11/gnome"
@ -16,7 +16,7 @@ EXTRA_OECONF = "--with-autoconf-archive"
EXTRA_AUTORECONF = ""
DEPENDS = ""
FILES_${PN} += "${datadir}/aclocal"
FILES_${PN}-dev = ""
FILES:${PN} += "${datadir}/aclocal"
FILES:${PN}-dev = ""
BBCLASSEXTEND = "native"

42
meta-gnome/recipes-devtools/python/python3-lxml_4.8.0.bb Normal file
View File

@ -0,0 +1,42 @@
SUMMARY = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
DESCRIPTION = "lxml is a Pythonic, mature binding for the libxml2 and \
libxslt libraries. It provides safe and convenient access to these \
libraries using the ElementTree API. It extends the ElementTree API \
significantly to offer support for XPath, RelaxNG, XML Schema, XSLT, \
C14N and much more."
HOMEPAGE = "https://lxml.de/"
SECTION = "devel/python"
LICENSE = "BSD-3-Clause & GPL-2.0-only & MIT & PSF-2.0"
LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \
file://doc/licenses/elementtree.txt;md5=eb34d036a6e3d56314ee49a6852ac891 \
file://doc/licenses/BSD.txt;md5=700a1fc17f4797d4f2d34970c8ee694b \
file://doc/licenses/GPL.txt;md5=94d55d512a9ba36caa9b7df079bae19f \
file://src/lxml/isoschematron/resources/rng/iso-schematron.rng;beginline=2;endline=7;md5=fc85684a8dd5fa272c086bceb0d99e10 \
file://src/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl;beginline=2;endline=24;md5=cc86b7b2bbc678e13f58ea403eb9929b \
file://src/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl;beginline=2;endline=7;md5=5b03236d293dc3784205542b409d2f53 \
"
DEPENDS += "libxml2 libxslt"
SRC_URI[sha256sum] = "f63f62fc60e6228a4ca9abae28228f35e1bd3ce675013d1dfb828688d50c6e23"
SRC_URI += "${PYPI_SRC_URI}"
inherit pkgconfig pypi setuptools3
# {standard input}: Assembler messages:
# {standard input}:1488805: Error: branch out of range
DEBUG_OPTIMIZATION:remove:mips = " -Og"
DEBUG_OPTIMIZATION:append:mips = " -O"
BUILD_OPTIMIZATION:remove:mips = " -Og"
BUILD_OPTIMIZATION:append:mips = " -O"
DEBUG_OPTIMIZATION:remove:mipsel = " -Og"
DEBUG_OPTIMIZATION:append:mipsel = " -O"
BUILD_OPTIMIZATION:remove:mipsel = " -Og"
BUILD_OPTIMIZATION:append:mipsel = " -O"
BBCLASSEXTEND = "native nativesdk"
RDEPENDS:${PN} += "libxml2 libxslt ${PYTHON_PN}-compression"
CLEANBROKEN = "1"

2
meta-gnome/recipes-devtools/yasm/yasm_git.bb
View File

@ -9,7 +9,7 @@ DEPENDS += "flex-native bison-native xmlto-native"
PV = "1.3.0+git${SRCPV}"
# v1.3.0
SRCREV = "ba463d3c26c0ece2e797b8d6381b161633b5971a"
SRC_URI = "git://github.com/yasm/yasm.git \
SRC_URI = "git://github.com/yasm/yasm.git;branch=master;protocol=https \
file://0001-Do-not-use-AC_HEADER_STDC.patch \
"

4
meta-gnome/recipes-freedesktop/accountsservice/accountsservice_0.6.55.bb
View File

@ -1,7 +1,7 @@
SUMMARY = "D-Bus service for accessing the list of user accounts and information attached to those accounts."
HOMEPAGE = "https://www.freedesktop.org/wiki/Software/AccountsService"
LICENSE = "GPLv3"
LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = "https://www.freedesktop.org/software/accountsservice/accountsservice-${PV}.tar.xz"
@ -12,7 +12,7 @@ DEPENDS = "glib-2.0 intltool-native polkit systemd glib-2.0-native dbus"
inherit meson pkgconfig gettext gobject-introspection
FILES_${PN} += "\
FILES:${PN} += "\
${datadir}/dbus-1/interfaces/*.xml \
${datadir}/dbus-1/system-services/org.freedesktop.Accounts.service \
${datadir}/polkit-1/actions/org.freedesktop.accounts.policy \

2
meta-gnome/recipes-freedesktop/colord/colord-gtk_0.1.26.bb
View File

@ -1,7 +1,7 @@
SUMMARY = "GTK support library for colord"
HOMEPAGE = "https://www.freedesktop.org/software/colord/"
LICENSE = "LGPLv3"
LICENSE = "LGPL-3.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
SRC_URI = "https://www.freedesktop.org/software/colord/releases/colord-gtk-${PV}.tar.xz"

4
meta-gnome/recipes-freedesktop/colord/colord-native.bb
View File

@ -1,8 +1,8 @@
require ${BPN}.inc
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-native:"
FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-native:"
inherit meson native
inherit meson pkgconfig native
DEPENDS += " \
meson-native \

10
meta-gnome/recipes-freedesktop/colord/colord.bb
View File

@ -1,10 +1,10 @@
require ${BPN}.inc
inherit meson gobject-introspection gsettings gettext bash-completion systemd features_check useradd
inherit meson gobject-introspection gsettings gettext bash-completion systemd features_check useradd pkgconfig
# polkit and gobject-introspection are mandatory and cannot be configured
REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data"
UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
GIR_MESON_OPTION = ""
DEPENDS += " \
${BPN}-native \
@ -28,9 +28,9 @@ EXTRA_OEMESON = " \
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd"
SYSTEMD_SERVICE_${PN} = "colord.service"
SYSTEMD_SERVICE:${PN} = "colord.service"
FILES_${PN} += " \
FILES:${PN} += " \
${datadir}/dbus-1 \
${datadir}/polkit-1 \
${datadir}/glib-2.0 \
@ -42,4 +42,4 @@ FILES_${PN} += " \
"
USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord"
USERADD_PARAM:${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord"

2
meta-gnome/recipes-freedesktop/colord/colord.inc
View File

@ -1,6 +1,6 @@
SUMMARY = "Making color management just work"
HOMEPAGE = "https://www.freedesktop.org/software/colord/"
LICENSE = "GPLv2 & LGPLv2.1"
LICENSE = "GPL-2.0-only & LGPL-2.1-only"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \

6
meta-gnome/recipes-freedesktop/geoclue/geoclue_2.5.7.bb
View File

@ -3,7 +3,7 @@ DESCRIPTION = "Geoclue is a D-Bus service that provides location information. \
The primary goal of the Geoclue project is to make creating location-aware applications \
as simple as possible, while the secondary goal is to ensure that no application \
can access location information without explicit permission from user."
LICENSE = "GPLv2.0+"
LICENSE = "GPL-2.0-or-later"
SECTION = "console/network"
LIC_FILES_CHKSUM = "file://COPYING;md5=bdfdd4986a0853eb84eeba85f9d0c4d6"
@ -34,14 +34,14 @@ EXTRA_OEMESON += " \
-Ddemo-agent=false \
"
FILES_${PN} += " \
FILES:${PN} += " \
${datadir}/dbus-1/system-services \
${libdir} \
${systemd_unitdir} \
${prefix}/libexec \
"
FILES_${PN}-dev += " \
FILES:${PN}-dev += " \
${datadir}/dbus-1/interfaces \
${datadir}/gir-1.0 \
"

4
meta-gnome/recipes-freedesktop/libgusb/libgusb_0.3.7.bb
View File

@ -1,11 +1,11 @@
SUMMARY = "GUsb is a GObject wrapper for libusb1"
LICENSE = "LGPLv2.1"
LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "glib-2.0 libusb1"
inherit meson gobject-introspection gtk-doc gettext vala
SRC_URI = "git://github.com/hughsie/libgusb.git"
SRC_URI = "git://github.com/hughsie/libgusb.git;branch=master;protocol=https"
SRCREV = "ff9c606d9d72c7dd369ad220d92729556faaaf0c"
S = "${WORKDIR}/git"

2
meta-gnome/recipes-freedesktop/libxklavier/libxklavier_5.4.bb
View File

@ -1,6 +1,6 @@
SUMMARY = "Library providing high-level API for X Keyboard Extension"
HOMEPAGE = "https://www.freedesktop.org/wiki/Software/LibXklavier"
LICENSE = "GPLv2"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812"
SRC_URI = "https://people.freedesktop.org/~svu/libxklavier-${PV}.tar.bz2"

30
meta-gnome/recipes-freedesktop/plymouth/plymouth.bb
View File

@ -8,14 +8,14 @@ DESCRIPTION = "Plymouth is an application that runs very early in the boot proce
HOMEPAGE = "http://www.freedesktop.org/wiki/Software/Plymouth"
SECTION = "base"
LICENSE = "GPLv2+"
LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "libcap libpng cairo dbus udev"
DEPENDS_append_libc-musl = " musl-rpmatch"
DEPENDS:append:libc-musl = " musl-rpmatch"
PROVIDES = "virtual/psplash"
RPROVIDES_${PN} = "virtual-psplash virtual-psplash-support"
RPROVIDES:${PN} = "virtual-psplash virtual-psplash-support"
SRCREV = "e55447500fa95a0cc59c741296030ed91a2986dc"
SRC_URI = " \
@ -31,8 +31,8 @@ EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-docum
"
PACKAGECONFIG ??= "pango initrd"
PACKAGECONFIG_append_x86 = " drm"
PACKAGECONFIG_append_x86-64 = " drm"
PACKAGECONFIG:append:x86 = " drm"
PACKAGECONFIG:append:x86-64 = " drm"
PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm"
PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango"
@ -43,9 +43,9 @@ LOGO ??= "${datadir}/plymouth/bizcom.png"
inherit autotools pkgconfig systemd gettext
LDFLAGS_append_libc-musl = " -lrpmatch"
LDFLAGS:append:libc-musl = " -lrpmatch"
do_install_append() {
do_install:append() {
# Remove /var/run from package as plymouth will populate it on startup
rm -fr "${D}${localstatedir}/run"
@ -54,7 +54,7 @@ do_install_append() {
fi
}
do_configure_prepend() {
do_configure:prepend() {
touch ${S}/ABOUT-NLS
mkdir -p ${S}/build-tools
touch ${S}/build-tools/config.rpath
@ -63,15 +63,15 @@ do_configure_prepend() {
PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'initrd', '${PN}-initrd ', '', d)}"
PACKAGES =+ "${PN}-set-default-theme"
FILES_${PN}-initrd = "${libexecdir}/plymouth/*"
FILES_${PN}-set-default-theme = "${sbindir}/plymouth-set-default-theme"
FILES:${PN}-initrd = "${libexecdir}/plymouth/*"
FILES:${PN}-set-default-theme = "${sbindir}/plymouth-set-default-theme"
FILES_${PN} += "${systemd_unitdir}/system/*"
FILES_${PN}-dbg += "${libdir}/plymouth/renderers/.debug"
FILES:${PN} += "${systemd_unitdir}/system/*"
FILES:${PN}-dbg += "${libdir}/plymouth/renderers/.debug"
RDEPENDS_${PN}-initrd = "bash dracut"
RDEPENDS_${PN}-set-default-theme = "bash"
RDEPENDS:${PN}-initrd = "bash dracut"
RDEPENDS:${PN}-set-default-theme = "bash"
SYSTEMD_SERVICE_${PN} = "plymouth-start.service"
SYSTEMD_SERVICE:${PN} = "plymouth-start.service"

Some files were not shown because too many files have changed in this diff Show More