8 Commits

Author SHA1 Message Date
Andreas Müller
5346b3baa8 Remove fixmac
MAC setup magic should not be installed by default in all our images

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-06-04 11:51:54 +02:00
Andreas Müller
903d753fc0 Ban weston-init from our images
Maybe I missed something:

* Although disabled by default it is started automatically
* A passwordless root account reached by two keys - NOT ACCECTABLE!!!
* Weston ships sessions that are the preferred way to start weston as
  unpriviledged user

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-06-04 11:51:54 +02:00
Andreas Müller
5e4b883bc2 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:22:54 +02:00
Andreas Müller
7e3a5954e5 network-manager-applet/-openvpn: Add missing bits to import vpn-config
This is more or less a backport of what will be send to master soon. Since
there is no hope to get backports added to stable branches, adjust recipes
here.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-03-18 18:15:28 +01:00
Andreas Müller
eca422e4a7 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:12:04 +01:00
Andreas Müller
babc8fbe27 scripts: prepare scipts to write bbone images based upon wic
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-09-19 12:42:53 +02:00
Andreas Müller
eb55623c66 instant-sysroot-target.bbclass: Minor corrections on remote debug instructions
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-09-10 22:06:16 +02:00
Andreas Müller
c921e73d35 Ensure rng-tools does not find it's way into images
It blocks shutdown for ages. [1] helps to see

[  232.089805] systemd-shutdown[1]: Sending SIGTERM to remaining processes...
[  232.128654] systemd-journald[188]: Received SIGTERM from PID 1 (systemd-shutdow).
[  322.127531] systemd-shutdown[1]: Sending SIGKILL to remaining processes...
[  322.166520] systemd-shutdown[1]: Sending SIGKILL to PID 178 (rngd).

[1] https://freedesktop.org/wiki/Software/systemd/Debugging/#index2h1

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-07-10 09:53:34 +02:00
63 changed files with 153 additions and 366 deletions

View File

@@ -70,7 +70,7 @@ It has its origin Ångström distribution - check https://github.com/Angstrom-d
* All images for console / kde / lxqt / xfce ar found. allgui-images build
images for all graphical environments.
[recipes-utils](recipes-utils):
[recipes-utlis](recipes-utlis):
* udev-rules-udisks-hide-bootpart: Hide boot partition from udisks
* Some tools (these are the only left from angstrom). Honestly: Have never
used them but kept them if users come from angstrom and might miss

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

@@ -0,0 +1,3 @@
EXTRA_OECONF_append = " \
--with-libnm-gtk \
"

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 +1,12 @@
PACKAGECONFIG_append = " gnome"
DEPENDS_append = " gtk+3 networkmanager network-manager-applet"
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:
if [ -e ${S}/appdata/network-manager-openvpn.metainfo.xml ]; then
mkdir -p ${B}/appdata
cp -f ${S}/appdata/network-manager-openvpn.metainfo.xml ${B}/appdata/
fi
}

View File

@@ -1 +0,0 @@
PACKAGECONFIG_append = " shared"

View File

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

View File

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

View File

@@ -7,11 +7,6 @@ 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() {
# ---------- qt.conf ----------
# create

View File

@@ -1 +1 @@
PACKAGECONFIG_append = " startup-notification gladeui2"
PACKAGECONFIG_append = " startup-notification gladeui"

View File

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

View File

@@ -1 +1 @@
PACKAGECONFIG_append = " sound-setter notify"
PACKAGECONFIG_append = " datetime-setter sound-setter notify"

View File

@@ -3,6 +3,8 @@ 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 @@
inherit instant-sysroot-native
INSANE_SKIP += "native-last"

View File

@@ -0,0 +1 @@
PACKAGECONFIG_append = " gnome"

View File

@@ -0,0 +1,2 @@
RRECOMMENDS_${PN}-sshd_remove_class-target = "rng-tools"

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

@@ -16,7 +16,7 @@ instant_sysroot_copy () {
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"

View File

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

View File

@@ -4,7 +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' or 'armv7ve' or 'cortexa7' or 'cortexa8' or 'cortexa9' in features:
if 'armv7a' in features or 'armv7ve' in features:
tune = 'armv7athf'
if 'bigendian' in features:
tune += 'b'
@@ -12,5 +12,6 @@ def armv7_tune_handler(d):
tune += '-neon'
else:
tune = d.getVar('DEFAULTTUNE')
return tune

View File

@@ -34,10 +34,10 @@ VIRTUAL-RUNTIME_init_manager = "systemd"
# 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"
@@ -56,6 +56,3 @@ DISTRO_FEATURES += "${DISTRO_WAYLAND}"
# Inherit the default LIBC features superset from OE-core
DISTRO_FEATURES += "${DISTRO_FEATURES_LIBC}"
# Uncomment for tests on gold-trouble only
#DISTRO_FEATURES += 'ld-is-gold'

View File

@@ -4,8 +4,6 @@
# libc settings
DISTRO_FEATURES += "${@['', ' nls'][d.getVar('ENABLE_BINARY_LOCALE_GENERATION') == '1']}"
DISTRO_FEATURES_remove = "ldconfig"
USE_NLS_glib-2.0 = "yes"
USE_NLS_glib-2.0-native = "yes"
USE_NLS_gcc-cross = "no"

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.1"
DISTRO_VERSION = "v2.7"
# 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
@@ -114,16 +114,17 @@ ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
# blacklist policy
PNBLACKLIST[pn-fso-apm] = "regular apmd is good enough"
PNBLACKLIST[weston-init] = "A passwordless root session reachable by two keys - security???"
PNBLACKLIST[packagegroup-core-x11] = "Conflicts with mortsgna-images"
PNBLACKLIST[xserver-nodm-init] = "Mortsgna-images use graphical display managers"
PNBLACKLIST[pn-fso-apm] = "regular apmd is good enough"
# warrior specific - on master there might come times they do the right thing...
PNBLACKLIST[rng-tools] = "blocks shutdown and no issues found for openssl"
###############################################################################
# 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
@@ -132,19 +133,17 @@ require conf/distro/include/no-static-libs.inc
# 1. They make sense
# 2. Many poky users out there might complain about my other layers or patches
# sent
# wait with 'mime' & 'mime-xdg' (meta-browser tests with old branches)
WARN_TO_ERROR_QA = " \
already-stripped compile-host-path install-host-path \
xorg-driver-abi textrel incompatible-license files-invalid infodir \
build-deps symlink-to-sysroot multilib \
installed-vs-shipped ldflags pn-overrides rpaths staticdev libdir \
uppercase-pn \
installed-vs-shipped ldflags pn-overrides rpaths staticdev \
unknown-configure-option useless-rpaths host-user-contaminated \
invalid-packageconfig patch-fuzz src-uri-bad \
invalid-packageconfig patch-fuzz \
"
WARN_QA_remove = "${WARN_TO_ERROR_QA}"
ERROR_QA_append = " ${WARN_TO_ERROR_QA}"
PNBLACKLIST[weston-init] = "A passwordless root session reachable by two keys - security???"
###############################################################################
# Image defaults
###############################################################################

View File

@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "mortsgna-layer"
BBFILE_PATTERN_mortsgna-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_mortsgna-layer = "7"
LAYERSERIES_COMPAT_mortsgna-layer = "dunfell gatesgarth hardknott"
LAYERSERIES_COMPAT_mortsgna-layer = "sumo thud warrior"
# 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
@@ -20,10 +20,10 @@ BBFILES_DYNAMIC += " \
\
gnome-layer:${LAYERDIR}/appends/meta-gnome/*.bbappend \
\
networking-layer:${LAYERDIR}/appends/meta-networking/*.bbappend \
\
multimedia-layer:${LAYERDIR}/appends/meta-multimedia/*.bbappend \
\
networking-layer:${LAYERDIR}/appends/meta-networking/*.bbappend \
\
openembedded-layer:${LAYERDIR}/appends/meta-oe/*.bbappend \
\
qt5-layer:${LAYERDIR}/appends/meta-qt5/*.bbappend \

View File

@@ -1,64 +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
* 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 gnome- / all kde-plasma- / lxqt- / liri- / lumina-sessions

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

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

@@ -1,10 +1,8 @@
[Configuration]
ColorForeground=#ffffffffffff
ColorBackground=#000000000000
ColorCursor=#a0a0a0a0a0a0
FontName=Monospace 10
FontName=Monospace 9
MiscAlwaysShowTabs=FALSE
MiscBell=FALSE
MiscBellUrgent=FALSE
MiscBordersDefault=TRUE
MiscCursorBlinks=FALSE
MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
@@ -12,6 +10,7 @@ MiscDefaultGeometry=80x24
MiscInheritGeometry=FALSE
MiscMenubarDefault=FALSE
MiscMouseAutohide=FALSE
MiscMouseWheelZoom=TRUE
MiscToolbarDefault=TRUE
MiscConfirmClose=TRUE
MiscCycleTabs=TRUE
@@ -19,5 +18,12 @@ MiscTabCloseButtons=TRUE
MiscTabCloseMiddleClick=TRUE
MiscTabPosition=GTK_POS_TOP
MiscHighlightUrls=TRUE
ScrollingLines=1000000
MiscMiddleClickOpensUri=FALSE
MiscCopyOnSelect=FALSE
MiscDefaultWorkingDir=
MiscRewrapOnResize=TRUE
MiscUseShiftArrowsToScroll=FALSE
MiscSlimTabs=FALSE
ColorForeground=#000000000000
ColorBackground=#fae0f4f1a311

View File

@@ -21,7 +21,6 @@
<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>
@@ -86,6 +85,5 @@
<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="plugin-7" type="string" value="xfce4-sensors-plugin"/>
</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

@@ -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,38 +0,0 @@
SUMMARY = "GNOME disk utility"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SECTION = "x11/gnome"
DEPENDS = " \
gtk+3 \
libdvdread \
libcanberra \
libnotify \
libsecret \
libpwquality \
udisks2 \
"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-version-is-even mime-xdg
REQUIRED_DISTRO_FEATURES = "x11"
EXTRA_OEMESON = " \
-Dman=false \
"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
# As soon as elogind is of interest this needs rework: meson option is combo
PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd"
SRC_URI[archive.sha256sum] = "dd033d3f36ab070bc72317cf3045e5b4927765543f1bce7612b2c7f96595167a"
FILES_${PN} += " \
${datadir}/metainfo \
${datadir}/dbus-1 \
"

View File

@@ -17,8 +17,6 @@ IMAGE_INSTALL += " \
network-manager-applet \
xfce4-default-config \
\
packagegroup-gnome-desktop \
\
packagegroup-lxqt-base \
lxqt-default-config \
\

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

@@ -13,15 +13,6 @@ IMAGE_INSTALL += " \
\
orage \
xfce4-orageclock-plugin \
\
pkgconfig binutils-symlinks elfutils gnu-config \
cmake meson \
gdbserver \
git git-bash-completion \
qt5-creator \
qwt-qt5 \
\
nodejs nodejs-npm nodejs-systemtap \
"
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

@@ -12,12 +12,9 @@ IMAGE_INSTALL += " \
systemd-bash-completion \
systemd-analyze \
cpufrequtils \
findutils \
htop \
util-linux-lsblk \
nano \
rsync \
wget \
"
IMAGE_DEV_MANAGER = "udev"

View File

@@ -1,19 +0,0 @@
require recipes-image/console/console-net-image.bb
require recipes-image/include/x11-base.inc
export IMAGE_BASENAME = "gnome-base-image"
GNOME_DM ?= "gdm"
IMAGE_INSTALL += " \
${X11_BASE_INSTALL} \
${GNOME_DM} \
\
packagegroup-gnome-desktop \
packagegroup-gui-base \
\
network-manager-applet \
"
# reenable graphical target
IMAGE_FEATURES += "x11-base"

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,7 +4,7 @@ X11_BASE_INSTALL += " \
${DISTRO_GUI_USER} \
packagegroup-core-x11-xserver \
\
dbus \
dbus-x11 \
iso-codes \
mime-support \
xauth \

View File

@@ -5,47 +5,39 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
inherit packagegroup
RDEPENDS_${PN} = " \
qt5-creator qtwebengine-dev \
qt5-creator \
qtquickcontrols2-examples qtwayland-examples \
hexedit \
glade \
glade3 glade \
umbrello \
lokalize \
geany-plugins \
gtk+3-demo \
gtk-demo gtk+3-demo \
\
weston weston-xwayland \
\
unzip xz tar bzip2 \
make cmake extra-cmake-modules meson \
make cmake \
automake autoconf libtool m4 \
gcc-symlinks g++-symlinks cpp-symlinks libgomp-dev \
gcc-symlinks g++-symlinks cpp-symlinks \
dtc \
pkgconfig binutils-symlinks elfutils gnu-config \
gdb gdbserver \
valgrind \
git git-bash-completion git-perltools subversion \
python3-core \
git git-bash-completion subversion \
python python-shell python-subprocess \
python3 \
perl php vala lua php json-glib \
texinfo gettext \
patch quilt ncurses dialog \
man man-pages \
gawk \
chrpath \
nodejs nodejs-npm nodejs-systemtap \
\
ruby ruby-dev \
\
libeigen-dev \
\
wireshark \
nfs-utils-client \
lmsensors-sensord lmsensors-sensorsdetect \
\
pulseview qtiohelper \
\
${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-microcontroller', 'meta-microcontroller-world', '', d)} \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
"
RDEPENDS_${PN}_append_libc-glibc = " \
@@ -53,5 +45,5 @@ RDEPENDS_${PN}_append_libc-glibc = " \
"
# qemu
#
# valgrind

View File

@@ -12,44 +12,48 @@ RDEPENDS_${PN} = " \
source-han-sans-kr-fonts \
source-han-sans-jp-fonts \
source-han-sans-tw-fonts \
ttf-noto-emoji-color \
ttf-noto-emoji-regular \
\
tzdata-misc tzdata-africa \
tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
\
${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \
abiword-meta \
gimp \
fontforge \
menulibre \
\
${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
\
gparted \
gnome-disk-utility \
\
mpd \
vlc \
parole gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-omx gstreamer1.0-libav \
dragon \
gstreamer1.0-plugins-base-meta gstreamer1.0-plugins-good-meta \
pulseaudio-misc \
${MACHINE_SPECIFICS_FULL} \
\
ark \
filelight \
konsole \
spectacle \
\
kde-apps-world \
\
gottcode-world \
\
qwt-qt5-examples \
gnuplot gnuplot-x11 \
qskinny \
\
${MACHINE_SPECIFICS_FULL} \
\
${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
\
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'mame dosbox dosbox-x cage cass80 z80 vice stella opentyrian d1x-rebirth', '', d)} \
\
${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice abiword-meta', '', d)} \
\
${@bb.utils.contains('BBFILE_COLLECTIONS', 'games-layer', 'pingus supertuxkart supertux2 freeciv wesnoth-all astromenace chromium-bsu maelstrom scummvm', '', d)} \
\
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'mame dosbox z80 vice stella opentyrian d1x-rebirth', '', d)} \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'games-layer', 'pingus supertux2 freeciv wesnoth-all astromenace chromium-bsu maelstrom', '', d)} \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-musicians', 'packagegroup-gui-musicians', '', d)} \
\
${@bb.utils.contains('BBFILE_COLLECTIONS', 'sdr-layer', 'packagegroup-sdr-python-extended packagegroup-sdr-gnuradio-base packagegroup-sdr-gnuradio-extended packagegroup-sdr-rtlsdr packagegroup-sdr-uhd', '', d)} \
\
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-qt5-extra', 'gottcode-world kde-apps-world qmlarkdown quaternion spectral', '', d)} \
"
# firefox

View File

@@ -7,9 +7,11 @@ inherit packagegroup
# Those listed here are either ugly or nonworking
RDEPENDS_${PN} = " \
atanks \
scummvm \
etr \
gnome-chess \
gnome-robots \
supertuxkart \
\
gnome-games \
mog \

View File

@@ -5,12 +5,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
inherit packagegroup
RDEPENDS_${PN} = " \
tzdata \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-initramfs', 'plymouth plymouth-set-default-theme plymouth-initrd', '', d)} \
xdg-user-dirs \
\
evince \
geany \
\
ntp ntp-utils \
tzdata \
dnsmasq \
devilspie2 \
@@ -18,5 +20,5 @@ RDEPENDS_${PN} = " \
gnome-system-monitor \
dconf-editor \
\
glmark2 mesa-demos \
glmark2 mesa-demos eglinfo-x11 \
"

View File

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

View File

@@ -1,30 +0,0 @@
require xfce4-music-image.bb
export IMAGE_BASENAME = "xfce4-music-dev-image"
XFCE_DM = "sddm sddm-morona-autologin"
IMAGE_INSTALL += " \
packagegroup-gui-dev \
\
xfce4-dev-tools \
libxfce4ui-glade \
\
packagegroup-gui-musicians \
\
${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \
${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
\
jack-dev \
lv2-dev \
libvorbis-dev \
aubio-dev \
libmad-dev \
libsamplerate0-dev \
rubberband-dev \
liblo-dev \
lilv-dev \
suil-dev \
serd-dev \
sord-dev \
"

View File

@@ -8,5 +8,5 @@ IMAGE_INSTALL += " \
packagegroup-gui-musicians \
\
${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \
${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \
"

View File

@@ -8,6 +8,5 @@ IMAGE_INSTALL += " \
rodent-icon-theme \
\
packagegroup-gui-tiny \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-musicians', 'xfce4-mixer', '', d)} \
"

View File

@@ -12,7 +12,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
# Feel free to add more...
BOOTPARTSPEC = "boot,vfat BOOT,vfat"
BOOTPARTSPEC_rpi = "rpi*,vfat"
BOOTPARTSPEC_rpi = "raspberrypi,vfat"
do_install () {
install -d ${D}${nonarch_base_libdir}/udev/rules.d

View File

@@ -83,8 +83,7 @@ SelectCardDevice() {
ErrorOut 'Cancel selected at SelectCardDevice().'
fi
DevicePath=${DevicePathArr[$menuitem]}
DeviceSize=`lsblk --nodeps --raw --noheadings --output SIZE --bytes $DevicePath`
DeviceSize=`lsblk --nodeps --raw --noheadings --output SIZE --bytes $dev`
unset menuitem
unset menuitems
fi
@@ -99,24 +98,16 @@ SelectCardDevice() {
# DeployFileDir: Path of the file selected
SelectDeployedFile() {
if [ -z "$DeployedFile" ]; then
if [ -z "$BITBAKE_TMPDIR" ]; then
GetBitbakeEnvVar "TMPDIR"
BITBAKE_TMPDIR="$BitbakeEnvVar"
fi
GetBitbakeEnvVar "TMPDIR"
_TMPDIR="$BitbakeEnvVar"
# bitbake environment found?
if [ -z "$BITBAKE_TMPDIR" ]; then
if [ -z "$_TMPDIR" ]; then
ErrorOut "Bitbake environment variable TMPDIR not found!"
fi
DeployPath=${BITBAKE_TMPDIR}/deploy/images/${Machine}
if [ ! -e ${DeployPath} ]; then
echo "${style_yellow}${style_bold}DeployPath: ${DeployPath}${style_normal}"
ErrorOut "Deploy path for ${Machine} not found! Wrong script started?"
fi
for FilePath in `find ${DeployPath} $FindString | sort` ; do
for FilePath in `find ${_TMPDIR}/deploy/images/${Machine} $FindString | sort` ; do
iCount=`expr $iCount + 1`
RootFileNameArr[${iCount}]="$FilePath"
FileSize=`du -Dbh "$FilePath" | cut -f1`
FileSize=`du -Dh "$FilePath" | cut -f1`
menuitems+=( "$iCount" "`basename $FilePath` / size: $FileSize" )
done

View File

@@ -20,11 +20,11 @@ RootCardWriteCallback() {
# write
StartMessage="\nWrite $DeployedFile to $DevicePath..."
if echo $DeployedFile | grep -q '.wic.gz'; then
EvalExAuto "gunzip -c $DeployedFile | dd of=$DevicePath status=progress oflag=nocache bs=1024K" "$StartMessage"
EvalExAuto "gunzip -c $DeployedFile | dd of=$DevicePath oflag=nocache bs=1024K" "$StartMessage"
elif echo $DeployedFile | grep -q '.wic.xz'; then
EvalExAuto "tar -x -f $DeployedFile --to-stdout | dd of=$DevicePath status=progress oflag=nocache bs=1024K" "$StartMessage"
EvalExAuto "tar -x -f $DeployedFile --to-stdout | dd of=$DevicePath oflag=nocache bs=1024K" "$StartMessage"
else
EvalExAuto "dd of=$DevicePath status=progress oflag=nocache if=$DeployedFile bs=1024K" "$StartMessage"
EvalExAuto "dd of=$DevicePath oflag=nocache if=$DeployedFile bs=1024K" "$StartMessage"
fi
# resize I
EvalExAuto "parted -s $DevicePath -- resizepart 2 -0" "\nResize I ${DevicePath}2..."

View File

@@ -20,9 +20,9 @@ RootCardWriteCallback() {
# write
StartMessage="\nWrite $DeployedFile to $DevicePath..."
if echo $DeployedFile | grep -q '.wic.gz'; then
EvalExAuto "gunzip -c $DeployedFile | dd of=$DevicePath status=progress oflag=nocache bs=1024K" "$StartMessage"
EvalExAuto "gunzip -c $DeployedFile | dd of=$DevicePath oflag=nocache bs=1024K" "$StartMessage"
else
EvalExAuto "dd of=$DevicePath status=progress oflag=nocache if=$DeployedFile bs=1024K" "$StartMessage"
EvalExAuto "dd of=$DevicePath oflag=nocache if=$DeployedFile bs=1024K" "$StartMessage"
fi
# resize I
EvalExAuto "parted -s $DevicePath -- resizepart 2 -0" "\nResize I ${DevicePath}2..."

View File

@@ -18,7 +18,7 @@ RootCardWriteCallback() {
# evt. write partition table
CheckPartitionTable "$DevicePath"
# write
EvalExAuto "dd of=$DevicePath status=progress oflag=nocache if=$DeployedFile bs=1024K" "\nWrite $DeployedFile to $DevicePath..."
EvalExAuto "dd of=$DevicePath oflag=nocache if=$DeployedFile bs=1024K" "\nWrite $DeployedFile to $DevicePath..."
# resize I
EvalExAuto "parted -s $DevicePath -- resizepart 2 -0" "\nResize I ${DevicePath}2..."
# resize II

View File

@@ -1,36 +1,26 @@
#!/bin/sh
# raspberrypi-card-write.sh
# (c) Copyright 2020 Andreas Müller <schnitzeltony@gmail.com>
# (c) Copyright 2018 Andreas Müller <schnitzeltony@gmail.com>
# Licensed under terms of GPLv2
#
# This script updates checksums in recipes after version bump. It is supposed
# to run run in same environment as bitbake:
#
# update-recipe-checksums.sh [-d <recipedir> <recipes>
# update-recipe-checksums.sh <recipe>
#
# where <recipe> can be a single recipe, a packagegroup an image or...
# Includes
. `dirname $0`/include/common-helpers.inc
echo
if [ "$1" = "-d" ]; then
shift
_TOPDIR="$1"
echo -e "${style_bold}Use $1 as recipe directory...${style_normal}"
shift
fi
if [ -z "$1" ]; then
ErrorOut "No fetch target set in first parameter!"
fi
if [ "x$_TOPDIR" = "x" ]; then
echo -e "${style_bold}Ask bitbake for recipe directory...${style_normal}"
GetBitbakeEnvVar "TOPDIR"
_TOPDIR="$BitbakeEnvVar"
fi
# Ask bitbake for recipe directory
GetBitbakeEnvVar "TOPDIR"
_TOPDIR="$BitbakeEnvVar"
echo
echo -e "${style_bold}Run bitbake -k --runall=fetch $@...${style_normal}"