5 Commits
master ... zeus

Author SHA1 Message Date
Andreas Müller
510508c16a Let all our images log volatile (not only xfce4-music-image)
should have done this much earlier:

* Don't ruin sd-cards on machines running 24/7
* On Raspi4 it buys us boot time reduced by ~2s
* Was never happy about the misleading entries in journal from boots long ago

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-05-10 13:23:13 +02:00
Andreas Müller
add8cea9aa console-net-image: add networkmanager-openvpn
In times of home-office users might want to tunnel to copmpany's network

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-03-18 18:20:26 +01:00
Andreas Müller
feb55c3052 instant-sysroot-target: move task copy_to_target_sysroot out of conflict zone
First results from scratch showed that previous commit did not work and set
copy_to_target_sysroot at a very early position beginning.

With default PACKAGE_CLASSES = "package_ipk" (no package_deb / package_rpm)
task order looks as expected without bb.utils.contains-dance

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit 549b52ed48)
2020-02-03 11:41:55 +01:00
Andreas Müller
d0ed2eca11 instant-sysroot-target: move task copy_to_target_sysroot out of conflict zone
Task copy_to_target_sysroot creates hardlinks and can run in parallell to e.g
package_ipk which causes sporadic failures as:

| Subprocess output:tar: ./usr/bin/.debug/guitarix: file changed as we read it
| ERROR: Logfile of failure stored in: <...>/temp/log.do_package_write_ipk.25489

There is not much we can do about host's tar
(see https://lists.gnu.org/archive/html/bug-tar/2007-08/msg00013.html) so
ensure copy_to_target_sysroot does not run parallel to package_deb /
package_ipk / package_rpm (depending on what PACKAGE_CLASSES sets).

Fixes [1]

[1] https://github.com/schnitzeltony/meta-mortsgna/issues/12

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit 0cf33d763e)
2020-02-03 11:41:29 +01:00
Andreas Müller
16e566b32a Upgrade DISTRO_VERSION
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-01-02 16:37:25 +01:00
127 changed files with 515 additions and 1075 deletions

View File

@@ -67,8 +67,8 @@ It has its origin Ångström distribution - check https://github.com/Angstrom-d
form /etc/skel.
[recipes-image](recipes-image):
* All images for cinnamon / console / gnome / kde / lxqt / weston / xfce are found in this folder.
allgui-images build images for all desktop environments.
* All images for console / kde / lxqt / xfce ar found. allgui-images build
images for all graphical environments.
[recipes-utils](recipes-utils):
* udev-rules-udisks-hide-bootpart: Hide boot partition from udisks
@@ -148,12 +148,6 @@ branch: master
revision: HEAD
```
```
URI: git://github.com/schnitzeltony/meta-gnome-forks.git
branch: master
revision: HEAD
```
#### To add plymouth to GUI-images:
```
@@ -171,6 +165,12 @@ branch: master
revision: HEAD
```
```
URI: git://github.com/meta-rust/meta-rust.git
branch: master
revision: HEAD
```
#### To pretend work:
```
URI: git://github.com/schnitzeltony/meta-office.git
@@ -220,7 +220,7 @@ Policies
* Please do not send private emails to maintainers. For questions/suggestions.. use GitHub issues.
* Pull requests should follow [OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) with the following additions:
* Use 4 spaces for indention always
* For splitting of long list values use four-space indentation on successive lines set the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
* For splitting of long list values use four-space indentation on sucessive lines set the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
-----------

3
TODO
View File

@@ -1,5 +1,8 @@
These are tasks are planned:
OE:
* Introduce security_flags.inc
Scripts:
* get rid of bashisms
* dialog -> ncurses?

View File

@@ -1 +1 @@
PACKAGECONFIG = "proprietary-codecs"
PACKAGECONFIG_append = " use-egl impl-side-painting proprietary-codecs"

View File

@@ -1 +1 @@
PACKAGECONFIG = "proprietary-codecs"
PACKAGECONFIG_append = " use-egl impl-side-painting proprietary-codecs"

View File

@@ -18,6 +18,7 @@ if(wnd_type == "WINDOW_TYPE_NORMAL") then
"xarchiver",
"Thunar",
"geany",
"gedit",
}
app_name = get_application_name()

View File

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

View File

@@ -0,0 +1 @@
PACKAGECONFIG_remove = "introspection"

View File

@@ -1 +1 @@
PACKAGECONFIG:append = " archive gcr libmtp libgphoto2 samba systemd"
PACKAGECONFIG_append = " archive gcr libmtp libgphoto2 samba systemd"

View File

@@ -1,6 +1,6 @@
PACKAGECONFIG ?= " \
jack \
portaudio \
readline \
sndfile \
jack \
pulseaudio \
portaudio \
"

View File

@@ -1,5 +0,0 @@
# In our environment dnsmasq is used by networkmanager only. That takes care
# of all the configuration parameters necessary. Unfortunately this is broken
# by dnsmasq running as service: It is set-up by configuration files and that
# are not matching networkmanagers's needs.
SYSTEMD_AUTO_ENABLE:${PN} = "disable"

View File

@@ -1 +0,0 @@
PACKAGECONFIG:append = " gnome"

View File

@@ -1,3 +0,0 @@
EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON"
RDEPENDS:${PN}-dev:remove = "${PN}-staticdev"

View File

@@ -1,4 +1,4 @@
do_install:append() {
do_install_append() {
# Since we
# * do not have angstroms's DISTRO_TYPE
# * do not want to set all debug-tweaks

View File

@@ -1 +0,0 @@
PACKAGECONFIG:append = " shared"

View File

@@ -1 +0,0 @@
PACKAGECONFIG:append = "gui"

View File

@@ -1 +1 @@
RRECOMMENDS:${PN} += "udev-rules-udisks-hide-bootpart"
RRECOMMENDS_${PN} += "udev-rules-udisks-hide-bootpart"

View File

@@ -1,3 +1 @@
inherit instant-sysroot-native
INSANE_SKIP += "native-last"

View File

@@ -7,12 +7,7 @@ PACKAGECONFIG_DISTRO += " \
inherit instant-paths
do_install:append() {
# at least KDE's extra-cmake-modules expect qmake-qt5
ln -s qmake ${D}/${bindir}/qmake-qt5
}
do_copy_to_target_sysroot:append() {
do_copy_to_target_sysroot_append() {
# ---------- qt.conf ----------
# create
generate_qt_config_file_paths

View File

@@ -1 +1 @@
PACKAGECONFIG:append = " examples"
PACKAGECONFIG_append = " examples"

View File

@@ -1 +1 @@
PACKAGECONFIG:append = " examples"
PACKAGECONFIG_append = " examples"

View File

@@ -1,3 +1,3 @@
# VLC is not part of meta-qt5. We add append here so the append will work only
# in case meta-qt5 is in layers
PACKAGECONFIG:append = " qt5"
PACKAGECONFIG_append = " qt5"

View File

@@ -1 +1 @@
PACKAGECONFIG:append = " gladeui2"
PACKAGECONFIG_append = " startup-notification gladeui2"

View File

@@ -1,3 +1,3 @@
RRECOMMENDS:${PN} += " \
RRECOMMENDS_${PN} += " \
imsettings \
"

View File

@@ -1 +1 @@
PACKAGECONFIG:append = " notify"
PACKAGECONFIG_append = " notify"

View File

@@ -1 +1 @@
PACKAGECONFIG:append = " sound-setter notify"
PACKAGECONFIG_append = " sound-setter notify"

View File

@@ -1 +0,0 @@
RRECOMMENDS:${PN} += "xfce4-terminal-default-config"

View File

@@ -25,10 +25,10 @@ if [ -z "$LANG" ]; then
fi
# `ls' enhancements:
export LS_OPTIONS='--color=auto'
eval `dircolors`
alias l.='ls -d .* --color=auto'
alias ll='ls -l --color=auto'
alias ls='ls --color=auto'
alias ls='ls $LS_OPTIONS'
alias ll='ls $LS_OPTIONS -l'
# colorize all grep variants
alias grep='grep --color'

View File

@@ -1,8 +1,10 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
BASEFILESISSUEINSTALL = "do_install_mortsgnaissue"
do_install_mortsgnaissue () {
echo ${MACHINE} > ${D}${sysconfdir}/hostname
install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir}
if [ -n "${DISTRO_NAME}" ]; then
echo -n "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue

View File

@@ -1,3 +1,3 @@
do_install:append() {
do_install_append() {
sed -i 's|root::0:0:root:/home/root:/bin/sh|root::0:0:root:/home/root:/bin/bash|' ${D}${datadir}/${BPN}/passwd.master
}

View File

@@ -1,5 +1,5 @@
# It is time I do suggest common / global PREFERRED_OPENGL variable
PACKAGECONFIG:remove:class-target = "opengl"
PACKAGECONFIG_remove_class-target = "opengl"
PACKAGECONFIG:append:class-target = " egl glesv2"
PACKAGECONFIG_append_class-target = " egl glesv2"

View File

@@ -1,3 +1 @@
inherit instant-sysroot-native
INSANE_SKIP += "native-last"

View File

@@ -1,3 +0,0 @@
PACKAGECONFIG = "hunspell"
RRECOMMENDS:${PN} += "hunspell-dictionaries"

View File

@@ -1,5 +1,6 @@
PACKAGECONFIG:append = " \
PACKAGECONFIG_append = " \
hls \
libmms \
faad \
fluidsynth \
"

View File

@@ -1,3 +1,3 @@
PACKAGECONFIG:append = " \
PACKAGECONFIG_append = " \
x264 \
"

View File

@@ -1 +1 @@
PACKAGECONFIG:append:class-target = " jack"
PACKAGECONFIG_append_class-target = " jack"

View File

@@ -1,4 +1,4 @@
kernel_do_deploy:append() {
kernel_do_deploy_append() {
# deploy an extra link containing abiversion - used by our
# card-kernel-write scripts
for imageType in ${KERNEL_IMAGETYPES} ; do

View File

@@ -1,5 +0,0 @@
# we want xf86-input-libinput and some BSP layers exceed their allowed limits :(
XSERVER:remove = " xf86-input-evdev "
# at least for test add xserver's standard xf86-video-modesetting
XSERVER:append = " xf86-video-modesetting"

View File

@@ -1 +1 @@
PACKAGECONFIG:append = " jack"
PACKAGECONFIG_append = " jack"

View File

@@ -1,8 +1,8 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://inputrc"
# Get more out of our console
do_install:append() {
do_install_append() {
cp ${WORKDIR}/inputrc ${D}${sysconfdir}/inputrc
}

View File

@@ -1 +0,0 @@
PACKAGECONFIG:append = " pam-wheel"

View File

@@ -1,2 +0,0 @@
# A root session without password activated by just two keys - honestly..
RRECOMMENDS:${PN}:remove = "weston-init"

View File

@@ -4,22 +4,22 @@
# Hardlink recipe sysroot and generated sysroot to instant native sysroot
#------------------------------------------------------------------------------
inherit instant-paths
inherit utils instant-paths
do_prepare_recipe_sysroot[postfuncs] += "${INSTANTSYSROOTFUNC}"
INSTANTSYSROOTFUNC = ""
INSTANTSYSROOTFUNC:class-native = "instant_sysroot_copy"
INSTANTSYSROOTFUNC:class-cross = "instant_sysroot_copy"
INSTANTSYSROOTFUNC_class-native = "instant_sysroot_copy"
INSTANTSYSROOTFUNC_class-cross = "instant_sysroot_copy"
instant_sysroot_copy () {
mkdir -p ${INSTANT_NATIVE_PATH}
hardlinkdir ${RECIPE_SYSROOT_NATIVE} ${INSTANT_NATIVE_PATH}
}
do_populate_sysroot[postfuncs] += "${INSTANTPOPULATE} "
do_populate_sysroot[postfuncs] += "${INSTANTPOPULATE}"
INSTANTPOPULATE = ""
INSTANTPOPULATE:class-native = "instant_populate_sysroot"
INSTANTPOPULATE:class-cross = "instant_populate_sysroot"
INSTANTPOPULATE_class-native = "instant_populate_sysroot"
INSTANTPOPULATE_class-cross = "instant_populate_sysroot"
instant_populate_sysroot () {
find "${SYSROOT_DESTDIR}${STAGING_DIR_NATIVE}" -type f -o -type l | while read file; do

View File

@@ -173,7 +173,10 @@ do_copy_to_target_sysroot() {
fi
}
addtask copy_to_target_sysroot after do_package_write_deb do_package_write_ipk do_package_write_rpm do_package_write_tar
addtask copy_to_target_sysroot after do_package_write_deb do_package_write_ipk do_package_write_rpm before do_build
# same as do package
do_copy_to_target_sysroot[vardeps] = "${PACKAGEBUILDPKGD} ${PACKAGESPLITFUNCS} ${PACKAGEFUNCS} ${@gen_packagevar(d)}"
do_copy_to_target_sysroot[stamp-extra-info] = "${MACHINE_ARCH}"

View File

@@ -8,7 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
do_compile[postfuncs] += "${COMPILE_POST_TARGET}"
COMPILE_POST_TARGET = ""
COMPILE_POST_TARGET:class-target = "instant_compile_target"
COMPILE_POST_TARGET_class-target = "instant_compile_target"
INSTANTPOPULATE_TOOLCHAIN_VARS = " \
CC \

View File

@@ -15,7 +15,7 @@
SKEL_INIT_MARKER = "force-skel-full-init"
# user recipe part
pkg_postinst:${PN}:prepend() {
pkg_postinst_${PN}_prepend() {
if [ -n "$D" -a -n "${USERNAME}" ]; then
touch $D/home/${USERNAME}/${SKEL_INIT_MARKER}
fi

View File

@@ -4,11 +4,7 @@ def armv7_tune_handler(d):
# to common tune value
if d.getVar('MORTSGNA_ARMV7_TUNE') == '1':
features = d.getVar('TUNE_FEATURES').split()
if 'armv7a' in features or \
'armv7ve' in features or \
'cortexa7' in features or \
'cortexa8' in features or \
'cortexa9' in features:
if 'armv7a' in features or 'armv7ve' in features:
tune = 'armv7athf'
if 'bigendian' in features:
tune += 'b'
@@ -16,5 +12,6 @@ def armv7_tune_handler(d):
tune += '-neon'
else:
tune = d.getVar('DEFAULTTUNE')
return tune

View File

@@ -29,34 +29,30 @@ DISTRO_FEATURES = " \
DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
VIRTUAL-RUNTIME_init_manager = "systemd"
# Uncomment to completely disable support for sysv scripts:
#PACKAGECONFIG:pn-systemd = "xz"
#PACKAGECONFIG_pn-systemd = "xz"
# USE-flag like features
DISTRO_FEATURES += "tk"
DISTRO_FEATURES += "x11"
DISTRO_FEATURES += "3g"
DISTRO_FEATURES += "pulseaudio"
DISTRO_FEATURES += "ldconfig"
DISTRO_FEATURES += "polkit"
DISTRO_FEATURES += "helpfiles"
# OpenGL support
DISTRO_FEATURES += "opengl"
# wayland...
DISTRO_WAYLAND = "wayland"
# No wayland for vivante blobs
DISTRO_WAYLAND:mx6 = ""
DISTRO_WAYLAND:mx7 = ""
DISTRO_WAYLAND:mx8 = ""
DISTRO_WAYLAND:use-mainline-bsp = "wayland"
DISTRO_WAYLAND_mx6 = ""
DISTRO_WAYLAND_mx7 = ""
DISTRO_WAYLAND_mx8 = ""
DISTRO_WAYLAND_use-mainline-bsp = "wayland"
DISTRO_FEATURES += "${DISTRO_WAYLAND}"
# vulkan
DISTRO_VULKAN = ""
DISTRO_VULKAN:raspberrypi4 = "vulkan"
DISTRO_VULKAN:raspberrypi4-64 = "vulkan"
DISTRO_FEATURES += "${DISTRO_VULKAN}"
# Uncomment for tests on gold-trouble only
#DISTRO_FEATURES += 'ld-is-gold'
# Inherit the default LIBC features superset from OE-core
DISTRO_FEATURES += "${DISTRO_FEATURES_LIBC}"

View File

@@ -4,6 +4,9 @@ INHERIT += "debian"
# activate config checker
INHERIT += "sanity"
# activate the blacklister
INHERIT += "blacklist"
# make devshell available as task
INHERIT += "devshell"
@@ -19,3 +22,5 @@ INHERIT += "sstate"
# drop buildinfo to /etc/build
INHERIT += "image-buildinfo-mortsgna"
# Prelink images
INHERIT += "image-prelink"

View File

@@ -1,2 +1,2 @@
# glibc:
SKIP_RECIPE[libiconv] = "the glibc provided iconv library is used"
PNBLACKLIST[libiconv] = "the glibc provided iconv library is used"

View File

@@ -4,7 +4,7 @@
# libc settings
DISTRO_FEATURES += "${@['', ' nls'][d.getVar('ENABLE_BINARY_LOCALE_GENERATION') == '1']}"
DISTRO_FEATURES:remove = "ldconfig"
DISTRO_FEATURES_remove = "ldconfig"
USE_NLS_glib-2.0 = "yes"
USE_NLS_glib-2.0-native = "yes"

View File

@@ -22,13 +22,3 @@ XSERVER ?= " \
xf86-video-modesetting \
"
# Follow meta-java README:
# Possible provider: cacao-initial-native and jamvm-initial-native
PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
# Possible provider: cacao-native and jamvm-native
PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
# Optional since there is only one provider for now
PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"

View File

@@ -10,7 +10,7 @@
###############################################################################
# follow Yocto version scheme
DISTRO_VERSION = "v3.5"
DISTRO_VERSION = "v3.0"
# With Angstrom we had DISTRO_TYPE = "debug"/"release". No recipe except
# good old lxdm takes care (yes it was me). OE-Core way is setting
@@ -54,7 +54,7 @@ ONLINE_PACKAGE_MANAGEMENT = "full"
BB_SIGNATURE_HANDLER ?= "OEBasicHash"
# We want to build a superset for the default config
LICENSE_FLAGS_ACCEPTED += "commercial"
LICENSE_FLAGS_WHITELIST += "commercial"
# Can be "glibc" or "musl"
TCLIBC ?= "glibc"
@@ -88,25 +88,19 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
# thumb2 only
ARM_INSTRUCTION_SET ??= "thumb"
ARM_INSTRUCTION_SET:armv4 ?= "arm"
ARM_INSTRUCTION_SET:armv5 ?= "arm"
ARM_INSTRUCTION_SET:armv6 ?= "arm"
ARM_INSTRUCTION_SET_armv4 ?= "arm"
ARM_INSTRUCTION_SET_armv5 ?= "arm"
ARM_INSTRUCTION_SET_armv6 ?= "arm"
# set MORTSGNA_ARMV7_TUNE="1" in your local.conf to build armv7athf
require conf/distro/include/mortsgna-armv7-tune.inc
DEFAULTTUNE:mortsgna := "${@armv7_tune_handler(d)}"
DEFAULTTUNE_mortsgna := "${@armv7_tune_handler(d)}"
###############################################################################
# Extra tweaks
###############################################################################
# xorg is seriously broken with 1.20 -> 21.1 and nobody seems to care
PREFERRED_VERSION_virtual/xserver = "1.20.%"
# enable fortran for octave
FORTRAN:forcevariable = ",fortran"
# Unbreak multimachine builds
LICENSE_DIRECTORY = "${DEPLOY_DIR}/licenses/${MACHINE_ARCH}"
@@ -117,36 +111,35 @@ MACHINEOVERRIDES[vardepsexclude] += "SOC_FAMILY"
ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
# qemu has taken a dislike to armeb as well
ENABLE_BINARY_LOCALE_GENERATION:armeb = "0"
ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
# blacklist policy
SKIP_RECIPE[pn-fso-apm] = "regular apmd is good enough"
SKIP_RECIPE[weston-init] = "A passwordless root session reachable by two keys - security???"
SKIP_RECIPE[packagegroup-core-x11] = "Conflicts with mortsgna-images"
SKIP_RECIPE[xserver-nodm-init] = "Mortsgna-images use graphical display managers"
PNBLACKLIST[pn-fso-apm] = "regular apmd is good enough"
###############################################################################
# Quality & security hardening
###############################################################################
require conf/distro/include/security_flags.inc
# uncomment to enable security flags - images tested had issues
#require conf/distro/include/security_flags.inc
# disable static libs
require conf/distro/include/no-static-libs.inc
# QA check settings - make all warnings errors
# QA check settings - a little stricter than the OE-Core / poky for two reasons
# 1. They make sense
# 2. Many poky users out there might complain about my other layers or patches
# sent
WARN_TO_ERROR_QA = " \
libdir xorg-driver-abi \
textrel incompatible-license files-invalid \
infodir build-deps src-uri-bad symlink-to-sysroot multilib \
invalid-packageconfig host-user-contaminated uppercase-pn patch-fuzz \
mime mime-xdg unlisted-pkg-lics unhandled-features-check \
missing-update-alternatives missing-ptest \
license-exists license-no-generic license-syntax license-format \
license-incompatible license-file-missing \
already-stripped compile-host-path install-host-path \
installed-vs-shipped ldflags pn-overrides rpaths staticdev \
unknown-configure-option useless-rpaths host-user-contaminated \
invalid-packageconfig patch-fuzz src-uri-bad \
"
WARN_QA:remove = "${WARN_TO_ERROR_QA}"
ERROR_QA:append = " ${WARN_TO_ERROR_QA}"
WARN_QA_remove = "${WARN_TO_ERROR_QA}"
ERROR_QA_append = " ${WARN_TO_ERROR_QA}"
###############################################################################
# Image defaults
@@ -163,7 +156,7 @@ DISTRO_GUI_USER ?= "unpriv-user"
# If you don't want parts of this in your packagegroup-base using images you can put this in the image recipe:
# BAD_RECOMMENDATIONS = "<packages-to-remove>"
# or
# IMAGE_INSTALL:remove = "<packages-to-remove>"
# IMAGE_INSTALL_remove = "<packages-to-remove>"
#
# os-release: Distro release info on target
# kernel modules: ship fs modules so you can mount stuff and af-packet so networking works
@@ -228,7 +221,7 @@ IMAGE_BOOT ?= "${IMAGE_INITSCRIPTS} \
IMAGE_INSTALL += "${IMAGE_BOOT}"
# some default locales
IMAGE_LINGUAS:libc-glibc ?= "de-de fr-fr en-us en-gb es-es it-it"
IMAGE_LINGUAS_libc-glibc ?= "de-de fr-fr en-us en-gb es-es it-it"
# there are important missing I bet
IMAGE_LINGUAS_FULL ?= " \

View File

@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "mortsgna-layer"
BBFILE_PATTERN_mortsgna-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_mortsgna-layer = "7"
LAYERSERIES_COMPAT_mortsgna-layer = "kirkstone langdale"
LAYERSERIES_COMPAT_mortsgna-layer = "sumo thud warrior zeus"
# This is a compromise: Because of dynamic appends it needs oe-core only. Our
# images have a huge dependency list (see README). So the layers set here are
@@ -17,12 +17,9 @@ LAYERDEPENDS_mortsgna-layer = "core openembedded-layer networking-layer"
BBFILES_DYNAMIC += " \
browser-layer:${LAYERDIR}/appends/meta-browser/*.bbappend \
chromium-browser-layer:${LAYERDIR}/appends/meta-browser/*.bbappend \
\
gnome-layer:${LAYERDIR}/appends/meta-gnome/*.bbappend \
\
networking-layer:${LAYERDIR}/appends/meta-networking/*.bbappend \
\
multimedia-layer:${LAYERDIR}/appends/meta-multimedia/*.bbappend \
\
openembedded-layer:${LAYERDIR}/appends/meta-oe/*.bbappend \

View File

@@ -21,11 +21,11 @@ do_install() {
cp $sourcepath/$qtconf $targetpath/
}
ALLOW_EMPTY:${PN} = "1"
ALLOW_EMPTY_${PN} = "1"
# An image installing this requires the following packages at least for working
# instant sdk support
RDEPENDS:${PN} = " \
RDEPENDS_${PN} = " \
qtbase \
gdbserver \
${TASK_BASIC_SSHDAEMON} \

View File

@@ -1,66 +0,0 @@
Setup new image:
* BACKUP CURRENT HOME
* REMOVE NETWORK PLUG
* 1st login xfce
* copy this file to /home/morona / open with gedit / setup colour theme
As root:
* systemctl disable serial-getty@ttyS0
* systemctl disable serial-getty@ttyAMA0
* systemctl enable dbus-broker.service
* systemctl --global enable dbus-broker.service
* create /home/<user>/.asoundrc with (soundcards can be sndrpihifiberry/audioinjectorpi...)
pcm.!default {
type hw
card sndrpihifiberry
}
ctl.!default {
type hw
card sndrpihifiberry
}
* audioinjector: enable mixer control "Output Mixer HiFi"
* passwd
As user:
* passwd
* check session autostart (evt. disable blueman/baloo/tracker/scrensaver..)
* datetime: timezone
* optionally for a tiny better performance: reduce screen resolution (yes really tested: 1280x1024 / 1280x720 are fine)
* check /var/log/postinstall.log
* restart
* network plug
* check journalctl output
* check systemd-analyze: Can be 8-9s
* glmark2-es2: On Pi3 (no B+) ~145 / On Pi 4 ~269
* chromium unselect 'Allow Chromium-sign-in / add ad-blocker / check youtube music-video
* libreoffice: open documents to set libreoffice default
* jack setup
* qtractor midiimport / open reference-project and check all instruments
* ardour5/6
* qmmp/projectm
* mixxx
* vlc
* supercollider
* krita/kdenlive/kalzium
* set-up git (.gitconfig) / ssh-keygen -> github
* qt-creator
standard build directory:
/home/morona/tmp/qtbuilds/build-%{CurrentProject:Name}-%{CurrentKit:FileSystemName}-%{CurrentBuild:Name}
help/about plugins
disable ClangCodeModel
kit/compiler:
set gcc explicitly - clang causes trouble on qml-register functions
kit/cmake:
CMAKE_INSTALL_PREFIX:STRING=/home/morona/tmp/qtinstalls/usr
CMAKE_PREFIX_PATH:STRING=/home/morona/tmp/qtinstalls/usr;%{Qt:QT_INSTALL_PREFIX}
OE_QMAKE_PATH_EXTERNAL_HOST_BINS:STRING=/usr/bin
* clone avr projects & build them
* kicad: open example / check 3d preview
* mame: set video opengl / test some ROMs
* vice: select cairo
* dosbox / dosbox-x / stella
* supertux(kart??)
* open all available desktops

View File

@@ -1,4 +1,4 @@
SUMMARY = "LXQT default user configuration"
DESCRIPTION = "This recipe presets xfce user default configuration"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

View File

@@ -0,0 +1,11 @@
[xfdesktop-version-4.10.3+-rcfile_format]
4.10.3+=true
[BB09-AB56]
row=1
col=0
[4C9E-146F]
row=0
col=0

View File

@@ -1,12 +1,10 @@
timeout=1
show_cpu=-3
show_cpu=0
show_icon=false
show_label_freq=true
show_label_governor=true
show_warning=true
keep_compact=false
one_line=false
fontname=Sans 7
icon_color_freq=false
freq_unit=0
fontname=Sans 8

View File

@@ -10,6 +10,8 @@ Command=xfce4-taskmanager
InTerminal=0
StartupNotification=1
ColorMode=0
Background=rgb(0,0,0)
PerCore=0
Foreground1=#0000ffff0000
Foreground2=#ffff00000000
Foreground3=#00000000ffff
Background=#333339393b3b

View File

@@ -0,0 +1,28 @@
[Main]
Timeout=500
Timeout_Seconds=1
Use_Timeout_Seconds=false
Use_Click_Command=false
Click_Command=xfce4-taskmanager
[SL_Cpu]
Enabled=false
Use_Label=true
Color=rgb(0,0,192)
Text=cpu
[SL_Mem]
Enabled=true
Use_Label=false
Color=rgb(0,192,0)
Text=mem
[SL_Swap]
Enabled=false
Use_Label=true
Color=rgb(240,240,0)
Text=swap
[SL_Uptime]
Enabled=false

View File

@@ -1,4 +1,4 @@
favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-web-browser.desktop,qjackctl.desktop,ardour5.desktop,ardour6.desktop,lmms.desktop,muse.desktop,qtractor.desktop,rosegarden.desktop,mixxx.desktop,cgenie.desktop,vice_64.desktop
favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-web-browser.desktop,qjackctl.desktop,ardour5.desktop,lmms.desktop,muse.desktop,qtractor.desktop,rosegarden.desktop,mixxx.desktop,cgenie.desktop,vice_64.desktop
recent=
button-title=Anwendungen
button-icon=xfce4-whiskermenu
@@ -15,6 +15,7 @@ category-icon-size=1
load-hierarchy=false
recent-items-max=10
favorites-in-recent=true
display-recent-default=false
position-search-alternate=false
position-commands-alternate=false
position-categories-alternate=false

View File

@@ -1,23 +0,0 @@
[General]
Show_Title=false
Show_Labels=false
str_fontsize=small
val_fontsize=1
Font=Sans 11
Update_Interval=1
Show_Units=true
Small_Spacings=false
Command_Name=xfce4-sensors
[Chip0]
Name=ACPI
Number=0
[Chip0_Feature0]
Address=0
Name=thermal_zone0
Color=#008000
Show=true
Min=0.00
Max=70.00

View File

@@ -0,0 +1,4 @@
display_type=0
display_textsize=2
group_policy=0

View File

@@ -0,0 +1,23 @@
[Configuration]
ColorForeground=#ffffffffffff
ColorBackground=#000000000000
ColorCursor=#a0a0a0a0a0a0
FontName=Monospace 9
MiscAlwaysShowTabs=FALSE
MiscBell=FALSE
MiscBordersDefault=TRUE
MiscCursorBlinks=FALSE
MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
MiscDefaultGeometry=80x24
MiscInheritGeometry=FALSE
MiscMenubarDefault=FALSE
MiscMouseAutohide=FALSE
MiscToolbarDefault=TRUE
MiscConfirmClose=TRUE
MiscCycleTabs=TRUE
MiscTabCloseButtons=TRUE
MiscTabCloseMiddleClick=TRUE
MiscTabPosition=GTK_POS_TOP
MiscHighlightUrls=TRUE
ScrollingLines=1000000

View File

@@ -4,14 +4,14 @@
<property name="default-view" type="string" value="void"/>
<property name="last-compact-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_SMALLEST"/>
<property name="last-details-view-column-order" type="string" value="THUNAR_COLUMN_NAME,THUNAR_COLUMN_SIZE,THUNAR_COLUMN_TYPE,THUNAR_COLUMN_DATE_MODIFIED"/>
<property name="last-details-view-column-widths" type="string" value="50,142,50,50,254,50,50,80,181,139"/>
<property name="last-details-view-column-widths" type="string" value="50,155,50,50,492,50,50,83,181"/>
<property name="last-details-view-fixed-columns" type="bool" value="false"/>
<property name="last-details-view-visible-columns" type="string" value="THUNAR_COLUMN_DATE_MODIFIED,THUNAR_COLUMN_NAME,THUNAR_COLUMN_SIZE,THUNAR_COLUMN_TYPE"/>
<property name="last-details-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_50_PERCENT"/>
<property name="last-details-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_SMALL"/>
<property name="last-icon-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_NORMAL"/>
<property name="last-location-bar" type="string" value="ThunarLocationEntry"/>
<property name="last-separator-position" type="int" value="232"/>
<property name="last-show-hidden" type="bool" value="true"/>
<property name="last-separator-position" type="int" value="303"/>
<property name="last-show-hidden" type="bool" value="false"/>
<property name="last-side-pane" type="string" value="ThunarShortcutsPane"/>
<property name="last-sort-column" type="string" value="THUNAR_COLUMN_NAME"/>
<property name="last-sort-order" type="string" value="GTK_SORT_ASCENDING"/>

View File

@@ -14,13 +14,13 @@
<value type="int" value="15"/>
<value type="int" value="8"/>
<value type="int" value="5"/>
<value type="int" value="9"/>
<value type="int" value="13"/>
<value type="int" value="6"/>
<value type="int" value="10"/>
<value type="int" value="2"/>
<value type="int" value="4"/>
<value type="int" value="11"/>
<value type="int" value="7"/>
<value type="int" value="12"/>
<value type="int" value="1"/>
</property>
@@ -52,17 +52,19 @@
<property name="show-frame" type="bool" value="false"/>
<property name="size-max" type="uint" value="40"/>
<property name="square-icons" type="bool" value="false"/>
<property name="icon-size" type="int" value="32"/>
</property>
<property name="plugin-8" type="string" value="closebutton">
<property name="theme" type="string" value="Default"/>
</property>
<property name="plugin-9" type="string" value="separator">
<property name="expand" type="bool" value="true"/>
<property name="style" type="uint" value="0"/>
</property>
<property name="plugin-10" type="string" value="separator">
<property name="style" type="uint" value="0"/>
</property>
<property name="plugin-13" type="string" value="separator">
<property name="style" type="uint" value="0"/>
<property name="expand" type="bool" value="true"/>
</property>
<property name="plugin-2" type="string" value="clock">
<property name="mode" type="uint" value="0"/>
@@ -82,24 +84,6 @@
<property name="plugin-3" type="string" value="whiskermenu"/>
<property name="plugin-1" type="string" value="cpugraph"/>
<property name="plugin-11" type="string" value="cpufreq"/>
<property name="plugin-12" type="string" value="systemload">
<property name="cpu" type="empty">
<property name="enabled" type="bool" value="false"/>
</property>
<property name="memory" type="empty">
<property name="label" type="string" value=""/>
</property>
<property name="swap" type="empty">
<property name="enabled" type="bool" value="false"/>
</property>
<property name="uptime" type="empty">
<property name="enabled" type="bool" value="false"/>
</property>
<property name="network" type="empty">
<property name="enabled" type="bool" value="true"/>
<property name="label" type="string" value=""/>
</property>
</property>
<property name="plugin-7" type="string" value="xfce4-sensors-plugin"/>
<property name="plugin-12" type="string" value="systemload"/>
</property>
</channel>

View File

@@ -3,6 +3,6 @@
<channel name="xfce4-settings-manager" version="1.0">
<property name="last" type="empty">
<property name="window-width" type="int" value="858"/>
<property name="window-height" type="int" value="675"/>
<property name="window-height" type="int" value="661"/>
</property>
</channel>

View File

@@ -2,12 +2,87 @@
<channel name="xfwm4" version="1.0">
<property name="general" type="empty">
<property name="frame_opacity" type="int" value="90"/>
<property name="inactive_opacity" type="int" value="90"/>
<property name="move_opacity" type="int" value="90"/>
<property name="activate_action" type="string" value="bring"/>
<property name="borderless_maximize" type="bool" value="true"/>
<property name="box_move" type="bool" value="false"/>
<property name="box_resize" type="bool" value="false"/>
<property name="button_layout" type="string" value="O|SHMC"/>
<property name="button_offset" type="int" value="0"/>
<property name="button_spacing" type="int" value="0"/>
<property name="click_to_focus" type="bool" value="true"/>
<property name="focus_delay" type="int" value="250"/>
<property name="cycle_apps_only" type="bool" value="false"/>
<property name="cycle_draw_frame" type="bool" value="true"/>
<property name="cycle_hidden" type="bool" value="true"/>
<property name="cycle_minimum" type="bool" value="true"/>
<property name="cycle_workspaces" type="bool" value="false"/>
<property name="double_click_time" type="int" value="250"/>
<property name="double_click_distance" type="int" value="5"/>
<property name="double_click_action" type="string" value="maximize"/>
<property name="easy_click" type="string" value="Alt"/>
<property name="focus_hint" type="bool" value="true"/>
<property name="focus_new" type="bool" value="true"/>
<property name="frame_opacity" type="int" value="87"/>
<property name="full_width_title" type="bool" value="true"/>
<property name="inactive_opacity" type="int" value="87"/>
<property name="maximized_offset" type="int" value="0"/>
<property name="move_opacity" type="int" value="87"/>
<property name="placement_ratio" type="int" value="20"/>
<property name="placement_mode" type="string" value="center"/>
<property name="popup_opacity" type="int" value="100"/>
<property name="resize_opacity" type="int" value="90"/>
<property name="mousewheel_rollup" type="bool" value="true"/>
<property name="prevent_focus_stealing" type="bool" value="false"/>
<property name="raise_delay" type="int" value="250"/>
<property name="raise_on_click" type="bool" value="true"/>
<property name="raise_on_focus" type="bool" value="false"/>
<property name="raise_with_any_button" type="bool" value="true"/>
<property name="repeat_urgent_blink" type="bool" value="false"/>
<property name="resize_opacity" type="int" value="87"/>
<property name="restore_on_move" type="bool" value="true"/>
<property name="scroll_workspaces" type="bool" value="true"/>
<property name="shadow_delta_height" type="int" value="0"/>
<property name="shadow_delta_width" type="int" value="0"/>
<property name="shadow_delta_x" type="int" value="0"/>
<property name="shadow_delta_y" type="int" value="-3"/>
<property name="shadow_opacity" type="int" value="50"/>
<property name="show_app_icon" type="bool" value="false"/>
<property name="show_dock_shadow" type="bool" value="true"/>
<property name="show_frame_shadow" type="bool" value="true"/>
<property name="show_popup_shadow" type="bool" value="false"/>
<property name="snap_resist" type="bool" value="false"/>
<property name="snap_to_border" type="bool" value="true"/>
<property name="snap_to_windows" type="bool" value="false"/>
<property name="snap_width" type="int" value="10"/>
<property name="theme" type="string" value="Default"/>
<property name="tile_on_move" type="bool" value="true"/>
<property name="title_alignment" type="string" value="center"/>
<property name="title_font" type="string" value="Sans Bold 9"/>
<property name="title_horizontal_offset" type="int" value="0"/>
<property name="title_shadow_active" type="string" value="false"/>
<property name="title_shadow_inactive" type="string" value="false"/>
<property name="title_vertical_offset_active" type="int" value="0"/>
<property name="title_vertical_offset_inactive" type="int" value="0"/>
<property name="toggle_workspaces" type="bool" value="false"/>
<property name="unredirect_overlays" type="bool" value="true"/>
<property name="urgent_blink" type="bool" value="false"/>
<property name="use_compositing" type="bool" value="false"/>
<property name="workspace_count" type="int" value="1"/>
<property name="workspace_names" type="array">
<value type="string" value="Arbeitsfläche 1"/>
<value type="string" value="Arbeitsfläche 2"/>
<value type="string" value="Arbeitsfläche 3"/>
<value type="string" value="Arbeitsfläche 4"/>
</property>
<property name="wrap_cycle" type="bool" value="true"/>
<property name="wrap_layout" type="bool" value="true"/>
<property name="wrap_resistance" type="int" value="10"/>
<property name="wrap_windows" type="bool" value="true"/>
<property name="wrap_workspaces" type="bool" value="false"/>
<property name="cycle_preview" type="bool" value="true"/>
<property name="cycle_tabwin_mode" type="int" value="0"/>
<property name="horiz_scroll_opacity" type="bool" value="false"/>
<property name="sync_to_vblank" type="bool" value="false"/>
<property name="titleless_maximize" type="bool" value="false"/>
<property name="zoom_desktop" type="bool" value="true"/>
</property>
</channel>

View File

@@ -0,0 +1,37 @@
[Default Applications]
application/x-bzip-compressed-tar=xarchiver.desktop
application/x-compressed-tar=xarchiver.desktop
text/plain=gedit.desktop
application/x-lrzip=xarchiver.desktop
application/x-bzip=xarchiver.desktop
application/gzip=xarchiver.desktop
application/x-lzip=xarchiver.desktop
application/zip=xarchiver.desktop
application/x-lzma-compressed-tar=xarchiver.desktop
application/x-tar=xarchiver.desktop
application/x-tarz=xarchiver.desktop
application/x-ustar=xarchiver.desktop
application/x-xz-compressed-tar=xarchiver.desktop
image/png=ristretto.desktop
image/jpeg=ristretto.desktop
application/x-deb=xarchiver.desktop
application/pdf=evince.desktop
[Added Associations]
application/x-bzip-compressed-tar=xarchiver.desktop;
application/x-compressed-tar=xarchiver.desktop;
text/plain=gedit.desktop;
application/x-lrzip=xarchiver.desktop;
application/x-bzip=xarchiver.desktop;
application/gzip=xarchiver.desktop;
application/x-lzip=xarchiver.desktop;
application/zip=xarchiver.desktop;
application/x-lzma-compressed-tar=xarchiver.desktop;
application/x-tar=xarchiver.desktop;
application/x-tarz=xarchiver.desktop;
application/x-ustar=xarchiver.desktop;
application/x-xz-compressed-tar=xarchiver.desktop;
image/png=ristretto.desktop;
image/jpeg=ristretto.desktop;
application/x-deb=xarchiver.desktop;
application/pdf=evince.desktop;

View File

@@ -1,6 +1,7 @@
SUMMARY = "XFCE default user configuration"
DESCRIPTION = "This recipe presets xfce user default configuration"
LICENSE = "MIT & CC0-1.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r4"
# License sunrise: https://www.pexels.com/photo/sunrise-under-cloudy-sky-illustration-67832/
@@ -23,9 +24,9 @@ do_install() {
install -m 0644 ${WORKDIR}/sunrise-sky-blue-sunlight-67832.jpeg ${D}${datadir}/backgrounds/
}
FILES:${PN} += "${datadir}/backgrounds"
FILES_${PN} += "${datadir}/backgrounds"
RDEPENDS:${PN} += " \
RDEPENDS_${PN} += " \
adwaita-icon-theme-cursors \
adwaita-icon-theme-symbolic \
adwaita-icon-theme-symbolic-hires \

View File

@@ -1,8 +0,0 @@
[Configuration]
MiscMenubarDefault=FALSE
MiscToolbarDefault=FALSE
MiscConfirmClose=FALSE
ScrollingLines=1000000
ScrollingOnOutput=FALSE
ColorPalette=rgb(0,0,0);rgb(252,30,30);rgb(132,237,32);rgb(236,202,50);rgb(48,70,252);rgb(198,60,221);rgb(6,152,154);rgb(211,215,207);rgb(85,87,83);rgb(252,96,96);rgb(161,246,79);rgb(247,232,114);rgb(99,131,254);rgb(211,167,206);rgb(80,252,252);rgb(238,238,236)

View File

@@ -1,15 +0,0 @@
SUMMARY = "xfce4-terminal default user configuration"
LICENSE = "MIT & CC0-1.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
inherit allarch
SRC_URI = " \
file://.config \
"
do_install() {
# default user configration -> /etc/skel
install -d ${D}${sysconfdir}/skel
cp -r ${WORKDIR}/.config ${D}${sysconfdir}/skel/
}

View File

@@ -1,11 +0,0 @@
SUMMARY = "Create usergroup wheel for sudo"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
inherit useradd
USERADD_PACKAGES = "${PN}"
#USERADD_PARAM = ""
GROUPADD_PARAM:${PN} = "--system wheel"
ALLOW_EMPTY:${PN} = "1"

View File

@@ -6,28 +6,27 @@ inherit useradd user-with-full-skel
USERNAME = "morona"
# groups user shall be member of (NO WHITESPACES ALLOWED)
USERGROUPS = "audio,video,dialout,wheel,${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'datetime,network,', '', d)}systemd-journal"
USERGROUPS = "audio,video,${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'datetime,network,', '', d)}systemd-journal"
# all those we are member of
USER_DEPS ?= " \
systemd \
\
group-wheel \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'polkit-group-rule-datetime polkit-group-rule-network', '', d)} \
"
DEPENDS += "${USER_DEPS}"
RDEPENDS:${PN} = "${USER_DEPS} bash"
RDEPENDS_${PN} = "${USER_DEPS} bash"
USERADD_PACKAGES = "${PN}"
USERADD_PARAM:${PN} = "-m -c Morona -d /home/${USERNAME} -s /bin/bash -k /etc/skel -g ${USERNAME} --groups ${USERGROUPS} ${USERNAME}"
USERADD_PARAM_${PN} = "-m -c Morona -d /home/${USERNAME} -s /bin/bash -k /etc/skel -g ${USERNAME} --groups ${USERGROUPS} ${USERNAME}"
GROUPADD_PARAM:${PN} = "${USERNAME}"
GROUPADD_PARAM_${PN} = "${USERNAME}"
pkg_postinst_ontarget:${PN}() {
pkg_postinst_ontarget_${PN}() {
# empty password
passwd -d ${USERNAME}
}
ALLOW_EMPTY:${PN} = "1"
ALLOW_EMPTY_${PN} = "1"

View File

@@ -1,20 +0,0 @@
SUMMARY = "W3C XML schema to C++ data binding compiler"
HOMEPAGE = "https://www.codesynthesis.com/products/xsd/"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://xsd/LICENSE;md5=79e31466c4d9f3a85f2f987c11ebcd83"
BBCLASSEXTEND = "native"
DEPENDS = "xerces-c"
SRC_URI = "https://codesynthesis.com/~boris/tmp/xsd/${PV}.a11/xsd-${PV}.a11+dep.tar.bz2"
SRC_URI[sha256sum] = "4fbe2d1e17ad4451bb3a9d9101ac89f7b465205470f1c7ad5e2c1386ac2c87d2"
S = "${WORKDIR}/xsd-${PV}.a11+dep"
do_install() {
install -d ${D}${includedir}
install -m 0755 -D ${S}/xsd/xsd/xsd ${D}${bindir}/xsdcxx
cp -r ${S}/xsd/libxsd/xsd ${D}${includedir}/xsd
}

View File

@@ -1,191 +0,0 @@
SUMMARY = "The X.Org X server"
HOMEPAGE = "http://www.x.org"
SECTION = "x11/base"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
# xf86-*-* packages depend on an X server built with the xfree86 DDX
# so we have a virtual to represent that:
# deprecated, we should use virtual/xserver instead
PROVIDES = "virtual/xserver-xf86"
# Other packages tend to just care that there is *an* X server:
PROVIDES += "virtual/xserver"
PE = "2"
INC_PR = "r8"
XORG_PN = "xorg-server"
SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.gz"
CVE_PRODUCT = "xorg-server x_server"
# This is specific to Debian's xserver-wrapper.c
CVE_CHECK_IGNORE += "CVE-2011-4613"
# As per upstream, exploiting this flaw is non-trivial and it requires exact
# timing on the behalf of the attacker. Many graphical applications exit if their
# connection to the X server is lost, so a typical desktop session is either
# impossible or difficult to exploit. There is currently no upstream patch
# available for this flaw.
CVE_CHECK_IGNORE += "CVE-2020-25697"
S = "${WORKDIR}/${XORG_PN}-${PV}"
inherit autotools pkgconfig
inherit features_check
REQUIRED_DISTRO_FEATURES = "x11"
LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess"
DEPENDS = "xorgproto ${LIB_DEPS} font-util"
# Split out some modules and extensions from the main package
# These aren't needed for basic operations and only take up space:
# 32.0k libdri.so
# 91.0k libexa.so
# 336.0k libglx.so
# 1360k libint10.so
# 180.0k libwfb.so
# 320.0k libxaa.so
# 124.0k libxf1bpp.so
# 84.0k libxf4bpp.so
# librecord.so
# libextmod.so
# libdbe.so
PACKAGES =+ "${PN}-sdl \
${PN}-fbdev \
${PN}-xvfb \
${PN}-utils \
${PN}-xephyr \
${PN}-xwayland \
${PN}-multimedia-modules \
${PN}-extension-dri \
${PN}-extension-dri2 \
${PN}-extension-glx \
${PN}-extension-record \
${PN}-extension-extmod \
${PN}-extension-dbe \
${PN}-module-libint10 \
${PN}-module-libafb \
${PN}-module-libwfb \
${PN}-module-libmfb \
${PN}-module-libcfb \
${PN}-module-exa \
${PN}-module-xaa \
${PN}-module-libxf1bpp \
${PN}-module-libxf4bpp \
xf86-video-modesetting"
SUMMARY:xf86-video-modesetting = "X.Org X server -- modesetting display driver"
INSANE_SKIP:${MLPREFIX}xf86-video-modesetting = "xorg-driver-abi"
XSERVER_RRECOMMENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp xf86-input-libinput"
RRECOMMENDS:${PN} += "${XSERVER_RRECOMMENDS}"
RRECOMMENDS:${PN}-xwayland += "${XSERVER_RRECOMMENDS}"
RDEPENDS:${PN}-xvfb += "xkeyboard-config"
RDEPENDS:${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
FILES:${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
FILES:${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
FILES:${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled"
FILES:${PN}-sdl = "${bindir}/Xsdl"
FILES:${PN}-fbdev = "${bindir}/Xfbdev"
FILES:${PN}-xvfb = "${bindir}/Xvfb"
FILES:${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
FILES:${PN}-xephyr = "${bindir}/Xephyr"
FILES:${PN}-xwayland = "${bindir}/Xwayland"
FILES:${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
FILES:${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
FILES:${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
FILES:${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
FILES:${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so"
FILES:${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so"
FILES:${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so"
FILES:${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
FILES:${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
FILES:${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
FILES:${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so"
FILES:${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so"
FILES:${PN}-module-exa = "${libdir}/xorg/modules/libexa.so"
FILES:${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
FILES:${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
FILES:${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
FILES:xf86-video-modesetting = "${libdir}/xorg/modules/drivers/modesetting_drv.so"
EXTRA_OECONF += "--with-fop=no \
--with-pic \
--disable-static \
--disable-record \
--disable-dmx \
--disable-xnest \
--enable-xvfb \
--enable-composite \
--without-dtrace \
--with-int10=x86emu \
--sysconfdir=/etc/X11 \
--localstatedir=/var \
--with-xkb-output=/var/lib/xkb \
--with-os-name=Linux \
"
OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-logind', '', d)} \
"
PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
PACKAGECONFIG[dga] = "--enable-dga,--disable-dga"
PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,virtual/mesa"
PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2"
# DRI3 requires xshmfence to also be enabled
PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3"
PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/libgl virtual/libx11"
PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy virtual/libgbm,libegl"
PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence"
PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd"
PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama"
PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland wayland-native wayland-protocols libepoxy"
# Xorg requires a SHA1 implementation, pick one
XORG_CRYPTO ??= "openssl"
PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl"
PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle"
PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt"
do_install:append () {
# Its assumed base-files creates this for us
rmdir ${D}${localstatedir}/log/
sed -i -e 's,${libdir}/xorg/modules,${prefix}/lib*/xorg/modules,' ${D}${mandir}/man5/xorg.conf.5
rm -f ${D}${bindir}/cvt
}
# Add runtime provides for the ABI versions of the video and input subsystems,
# so that drivers can depend on the relevant version.
python populate_packages:prepend() {
import subprocess
# Set PKG_CONFIG_PATH so pkg-config looks at the .pc files that are going
# into the new package, not the staged ones.
newenv = dict(os.environ)
newenv["PKG_CONFIG_PATH"] = d.expand("${PKGD}${libdir}/pkgconfig/")
def get_abi(name):
abis = {
"video": "abi_videodrv",
"input": "abi_xinput"
}
p = subprocess.Popen(args="pkg-config --variable=%s xorg-server" % abis[name],
shell=True, env=newenv, stdout=subprocess.PIPE)
stdout, stderr = p.communicate()
output = stdout.decode("utf-8").split(".")[0]
mlprefix = d.getVar('MLPREFIX') or ''
return "%sxorg-abi-%s-%s" % (mlprefix, name, output)
pn = d.getVar("PN")
d.appendVar("RPROVIDES:" + pn, " " + get_abi("input"))
d.appendVar("RPROVIDES:" + pn, " " + get_abi("video"))
}

View File

@@ -1,23 +0,0 @@
From 84338444179cab7ede1252a11b66e3b8f657e6a4 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 7 Feb 2020 20:36:45 +0100
Subject: [PATCH] drmmode_display.c: add missing mi.h include
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
hw/xfree86/drivers/modesetting/drmmode_display.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index e18cc37..3445cce 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -46,6 +46,7 @@
#include "xf86Crtc.h"
#include "drmmode_display.h"
#include "present.h"
+#include "mi.h"
#include <cursorstr.h>

View File

@@ -1,90 +0,0 @@
From 12041ad0610f1345d6b9994c32943fd4dd01f65d Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu, 20 Jan 2022 10:20:38 +0100
Subject: [PATCH] render: Fix build with gcc 12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The xserver fails to compile with the latest gcc 12:
render/picture.c: In function CreateSolidPicture:
render/picture.c:874:26: error: array subscript union _SourcePict[0] is partly outside array bounds of unsigned char[16] [-Werror=array-bounds]
874 | pPicture->pSourcePict->type = SourcePictTypeSolidFill;
| ^~
render/picture.c:868:45: note: object of size 16 allocated by malloc
868 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
render/picture.c: In function CreateLinearGradientPicture:
render/picture.c:906:26: error: array subscript union _SourcePict[0] is partly outside array bounds of unsigned char[32] [-Werror=array-bounds]
906 | pPicture->pSourcePict->linear.type = SourcePictTypeLinear;
| ^~
render/picture.c:899:45: note: object of size 32 allocated by malloc
899 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
render/picture.c: In function CreateConicalGradientPicture:
render/picture.c:989:26: error: array subscript union _SourcePict[0] is partly outside array bounds of unsigned char[32] [-Werror=array-bounds]
989 | pPicture->pSourcePict->conical.type = SourcePictTypeConical;
| ^~
render/picture.c:982:45: note: object of size 32 allocated by malloc
982 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
This is because gcc 12 has become stricter and raises a warning now.
Fix the warning/error by allocating enough memory to store the union
struct.
Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/c6b0dcb82d4db07a2f32c09a8c09c85a5f57248e]
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1256
---
render/picture.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/render/picture.c b/render/picture.c
index afa0d25..2be4b19 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -865,7 +865,7 @@ CreateSolidPicture(Picture pid, xRenderColor * color, int *error)
}
pPicture->id = pid;
- pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill));
+ pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
if (!pPicture->pSourcePict) {
*error = BadAlloc;
free(pPicture);
@@ -896,7 +896,7 @@ CreateLinearGradientPicture(Picture pid, xPointFixed * p1, xPointFixed * p2,
}
pPicture->id = pid;
- pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient));
+ pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
if (!pPicture->pSourcePict) {
*error = BadAlloc;
free(pPicture);
@@ -936,7 +936,7 @@ CreateRadialGradientPicture(Picture pid, xPointFixed * inner,
}
pPicture->id = pid;
- pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictRadialGradient));
+ pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
if (!pPicture->pSourcePict) {
*error = BadAlloc;
free(pPicture);
@@ -979,7 +979,7 @@ CreateConicalGradientPicture(Picture pid, xPointFixed * center, xFixed angle,
}
pPicture->id = pid;
- pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient));
+ pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
if (!pPicture->pSourcePict) {
*error = BadAlloc;
free(pPicture);
--
2.35.1

View File

@@ -1,36 +0,0 @@
From 8a382c015cd3c69fcfc146ef03dcbf30c77ff207 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 1 Mar 2019 09:47:57 -0800
Subject: [PATCH] test/xtest: Initialize array with braces
Fixes an error when extra warnings are enabled, this is caught with clang
test/xtest.c:64:23: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
WindowRec root = {0};
^
{}
1 error generated.
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
test/xtest.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/xtest.c b/test/xtest.c
index fc5e433..d7e6620 100644
--- a/test/xtest.c
+++ b/test/xtest.c
@@ -61,7 +61,7 @@ xtest_init_devices(void)
{
ScreenRec screen = {0};
ClientRec server_client = {0};
- WindowRec root = {0};
+ WindowRec root = {{0}};
WindowOptRec optional = {0};
/* random stuff that needs initialization */
--
2.21.0

View File

@@ -1,53 +0,0 @@
From d77cdc5e1eee26821ab98c947abea53fb7b18fe5 Mon Sep 17 00:00:00 2001
From: California Sullivan <california.l.sullivan@intel.com>
Date: Fri, 16 Mar 2018 17:23:11 -0700
Subject: [PATCH] xf86pciBus.c: use Intel ddx only for pre-gen4 hardware
Use intel ddx only on pre-gen4 hw, newer ones will fall back to modesetting
Author: Timo Aaltonen <tjaalton@debian.org>
Instead of defaulting to the Intel driver for all Intel hardware, only
default it for older hardware for which it has shown to be better for.
Others fall through to the -modesetting default.
Upstream-Status: Pending [Debian/Fedora patch
https://src.fedoraproject.org/rpms/xorg-x11-server/c/ee515e44b07e37689abf48cf2fffb41578f3bc1d]
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
---
hw/xfree86/common/xf86pciBus.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index e61ae0cd4..d70c99197 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -1173,7 +1173,23 @@ xf86VideoPtrToDriverList(struct pci_device *dev,
case 0x0bef:
/* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */
break;
- default:
+ /* Default to intel only on pre-gen4 chips */
+ case 0x3577:
+ case 0x2562:
+ case 0x3582:
+ case 0x358e:
+ case 0x2572:
+ case 0x2582:
+ case 0x258a:
+ case 0x2592:
+ case 0x2772:
+ case 0x27a2:
+ case 0x27ae:
+ case 0x29b2:
+ case 0x29c2:
+ case 0x29d2:
+ case 0xa001:
+ case 0xa011:
driverList[0] = "intel";
break;
}
--
2.14.3

View File

@@ -1,34 +0,0 @@
Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/22]
Signed-off-by: Ross Burton <ross.burton@intel.com>
From 5f65a6246fe752764045dd1e38912f1dccec71e4 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Thu, 20 Sep 2018 20:12:24 +0100
Subject: [PATCH] xorg-server.m4: just all cflags instead of just sdkdir
Instead of fetching just the sdkdir variable of xorg-server using pkg-config,
simply get all of the CFLAGS. Aside from completeness, this helps builds in
sysroots as pkg-config knows what to do with --cflags but doesn't remap
arbitrary variables.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
xorg-server.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xorg-server.m4 b/xorg-server.m4
index 18255b91a..195bda5d8 100644
--- a/xorg-server.m4
+++ b/xorg-server.m4
@@ -31,7 +31,7 @@ dnl
AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
+ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include "xorg-server.h"
#if !defined $1
--
2.11.0

View File

@@ -1,50 +0,0 @@
Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253]
Signed-off-by: Ross Burton <ross.burton@intel.com>
From ca832598d38ba55a001088b57d73c6d7261dc9a7 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Thu, 1 Aug 2019 15:24:51 +0100
Subject: [PATCH] sdksyms.sh: don't embed the build path
This script generates a header that has a comment containing the build path for
no real reason. As this source can end up deployed on targets in debug packages
this means there is both potentially sensitive information leakage about the
build environment, and a source of change for reproducible builds.
---
hw/xfree86/sdksyms.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 39e33711d..bdf47a71a 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -302,13 +302,16 @@ LC_ALL=C
export LC_ALL
${CPP:-cpp} "$@" sdksyms.c > /dev/null || exit $?
${CPP:-cpp} "$@" sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
+function basename(file) {
+ sub(".*/", "", file)
+ return file
+}
BEGIN {
sdk = 0;
print("/*");
print(" * These symbols are referenced to ensure they");
print(" * will be available in the X Server binary.");
print(" */");
- printf("/* topdir=%s */\n", topdir);
print("_X_HIDDEN void *xorg_symbols[] = {");
printf("sdksyms.c:") > "sdksyms.dep";
@@ -337,7 +340,7 @@ BEGIN {
# remove quotes
gsub(/"/, "", $3);
line = $2;
- header = $3;
+ header = basename($3);
if (! headers[$3]) {
printf(" \\\n %s", $3) >> "sdksyms.dep";
headers[$3] = 1;
--
2.20.1

View File

@@ -1,34 +0,0 @@
require xserver-xorg.inc
SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
file://pkgconfig.patch \
file://0001-test-xtest-Initialize-array-with-braces.patch \
file://sdksyms-no-build-path.patch \
file://0001-drmmode_display.c-add-missing-mi.h-include.patch \
file://0001-render-Fix-build-with-gcc-12.patch \
"
SRC_URI[sha256sum] = "54b199c9280ff8bf0f73a54a759645bd0eeeda7255d1c99310d5b7595f3ac066"
CFLAGS += "-fcommon"
# These extensions are now integrated into the server, so declare the migration
# path for in-place upgrades.
RREPLACES:${PN} = "${PN}-extension-dri \
${PN}-extension-dri2 \
${PN}-extension-record \
${PN}-extension-extmod \
${PN}-extension-dbe \
"
RPROVIDES:${PN} = "${PN}-extension-dri \
${PN}-extension-dri2 \
${PN}-extension-record \
${PN}-extension-extmod \
${PN}-extension-dbe \
"
RCONFLICTS:${PN} = "${PN}-extension-dri \
${PN}-extension-dri2 \
${PN}-extension-record \
${PN}-extension-extmod \
${PN}-extension-dbe \
"

View File

@@ -17,13 +17,11 @@ IMAGE_INSTALL += " \
network-manager-applet \
xfce4-default-config \
\
packagegroup-gnome-desktop \
\
packagegroup-cinnamon-base \
\
packagegroup-lxqt-base \
lxqt-default-config \
\
liri-world \
\
lumina-world \
\
weston weston-xwayland \

View File

@@ -5,6 +5,7 @@ export IMAGE_BASENAME = "allgui-dev-image"
IMAGE_INSTALL += " \
packagegroup-gui-dev \
\
exo-csource \
xfce4-dev-tools \
libxfce4ui-glade \
"

View File

@@ -6,6 +6,8 @@ IMAGE_INSTALL += " \
packagegroup-gui-full \
kde-world \
\
onboard \
\
faenza-icon-theme \
openzone \
\
@@ -22,4 +24,4 @@ IMAGE_INSTALL += " \
nodejs nodejs-npm nodejs-systemtap \
"
IMAGE_LINGUAS:libc-glibc = "${IMAGE_LINGUAS_FULL}"
IMAGE_LINGUAS_libc-glibc = "${IMAGE_LINGUAS_FULL}"

View File

@@ -13,7 +13,5 @@ IMAGE_INSTALL += " \
\
packagegroup-kde-apps-tiny \
\
packagegroup-gnome-apps \
\
weston-examples \
"

View File

@@ -1,19 +0,0 @@
require recipes-image/console/console-net-image.bb
require recipes-image/include/x11-base.inc
export IMAGE_BASENAME = "cinnamon-base-image"
CINNAMON_DM ?= "lxdm"
IMAGE_INSTALL += " \
${X11_BASE_INSTALL} \
${CINNAMON_DM} \
\
packagegroup-cinnamon-base \
packagegroup-gui-base \
\
xfce4-terminal \
"
# reenable graphical target
IMAGE_FEATURES += "x11-base"

View File

@@ -1,8 +0,0 @@
require cinnamon-tiny-image.bb
export IMAGE_BASENAME = "cinnamon-full-image"
IMAGE_INSTALL += " \
packagegroup-gui-full \
"

View File

@@ -1,8 +0,0 @@
require cinnamon-base-image.bb
export IMAGE_BASENAME = "cinnamon-tiny-image"
IMAGE_INSTALL += " \
packagegroup-gui-tiny \
"

View File

@@ -12,20 +12,12 @@ IMAGE_INSTALL += " \
systemd-bash-completion \
systemd-analyze \
cpufrequtils \
findutils \
htop \
fixmac \
util-linux-lsblk \
nano \
rsync \
wget \
dbus-broker \
sudo \
${LIBC_SPECIFIC_PACKS} \
"
LIBC_SPECIFIC_PACKS = ""
LIBC_SPECIFIC_PACKS:libc-glibc = "glibc-gconv glibc-gconvs glibc-utils"
IMAGE_DEV_MANAGER = "udev"
IMAGE_INIT_MANAGER = "systemd"
IMAGE_INITSCRIPTS = " "

View File

@@ -6,8 +6,7 @@ NETWORKPACKS ?= " \
iputils \
networkmanager \
networkmanager-openvpn \
networkmanager-nmcli \
networkmanager-nmcli-bash-completion \
networkmanager-bash-completion \
"
IMAGE_INSTALL += " \

View File

@@ -1,10 +0,0 @@
require gnome-base-image.bb
export IMAGE_BASENAME = "gnome-tiny-image"
IMAGE_INSTALL += " \
packagegroup-gnome-apps \
\
packagegroup-gui-tiny \
"

View File

@@ -4,6 +4,7 @@ X11_BASE_INSTALL += " \
${DISTRO_GUI_USER} \
packagegroup-core-x11-xserver \
\
dbus-x11 \
iso-codes \
mime-support \
xauth \

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