10 Commits

Author SHA1 Message Date
Andreas Müller
19f40f2e85 Card write all supported machines: Show progress
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2022-05-06 10:28:37 +02:00
Andreas Müller
40e25d1bbf card-helpers.inc: avoid incorrect size calculations
This popped up when setting BITBAKE_TMPDIR

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2022-03-29 14:09:53 +02:00
Andreas Müller
afec76bcbf card-helpers.inc: Don't ask bitbake for BITBAKE_TMPDIR if BITBAKE_TMPDIR is set
We need this when running bitbake in container

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2022-03-29 10:48:59 +02:00
Andreas Müller
140f8964b5 card-helpers.inc: rename _TMPDIR to BITBAKE_TMPDIR
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2022-03-29 09:45:45 +02:00
Andreas Müller
9d2b8fac1c card-helpers.inc: Show more proper sizes
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2022-03-29 09:41:13 +02:00
Andreas Müller
e195b4c240 packagegroup-gui-dev: add ruby
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit 0d1b428b13)
2021-05-13 16:04:43 +02:00
Andreas Müller
71e3a79ae8 raspi-image-test-and-setup: remove some lines unused or not recommended
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit 13972e1d85)
2021-05-04 23:16:49 +02:00
Andreas Müller
8f0507a33b udev-rules-udisks-hide-bootpart: Follow boot partition rename in meta-raspi-light
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit e10a176f88)
2021-05-04 23:16:34 +02:00
Andreas Müller
90e296a3f7 card-helpers: Add hint for tired users running non matching card-write scripts
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit 715ae745b6)
2021-05-04 23:14:42 +02:00
Andreas Müller
91e5d6c313 Get chromium-x11 back into our images after meta-browser layer split
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit af1911a492)
2021-05-04 23:14:25 +02:00
81 changed files with 340 additions and 213 deletions

View File

@@ -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)
-----------

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

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

View File

@@ -2,4 +2,4 @@
# 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"
SYSTEMD_AUTO_ENABLE_${PN} = "disable"

View File

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

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 +1 @@
PACKAGECONFIG:append = " shared"
PACKAGECONFIG_append = " shared"

View File

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

View File

@@ -7,12 +7,12 @@ PACKAGECONFIG_DISTRO += " \
inherit instant-paths
do_install:append() {
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 = " startup-notification 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

@@ -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,4 +1,4 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
BASEFILESISSUEINSTALL = "do_install_mortsgnaissue"

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 +0,0 @@
PACKAGECONFIG = "hunspell"
RRECOMMENDS:${PN} += "hunspell-dictionaries"

View File

@@ -1,4 +1,4 @@
PACKAGECONFIG:append = " \
PACKAGECONFIG_append = " \
hls \
libmms \
faad \

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 +1,5 @@
# we want xf86-input-libinput and some BSP layers exceed their allowed limits :(
XSERVER:remove = " xf86-input-evdev "
XSERVER_remove = " xf86-input-evdev "
# at least for test add xserver's standard xf86-video-modesetting
XSERVER:append = " 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 +1,2 @@
# A root session without password activated by just two keys - honestly..
RRECOMMENDS:${PN}:remove = "weston-init"
RRECOMMENDS_${PN}_remove = "weston-init"

View File

@@ -8,8 +8,8 @@ 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}
@@ -18,8 +18,8 @@ instant_sysroot_copy () {
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' or 'armv7ve' or 'cortexa7' or 'cortexa8' or 'cortexa9' in features:
tune = 'armv7athf'
if 'bigendian' in features:
tune += 'b'

View File

@@ -29,7 +29,7 @@ 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"
@@ -44,18 +44,17 @@ 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}"
# 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,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

@@ -10,7 +10,7 @@
###############################################################################
# follow Yocto version scheme
DISTRO_VERSION = "v3.4"
DISTRO_VERSION = "v3.1"
# 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
@@ -88,13 +88,13 @@ 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)}"
###############################################################################
@@ -111,7 +111,7 @@ 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
PNBLACKLIST[pn-fso-apm] = "regular apmd is good enough"
@@ -128,19 +128,22 @@ 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
# wait with 'mime' & 'mime-xdg' (meta-browser tests with old branches)
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 \
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 \
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
@@ -157,7 +160,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
@@ -222,7 +225,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 = "honister"
LAYERSERIES_COMPAT_mortsgna-layer = "dunfell gatesgarth hardknott"
# 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,7 +17,6 @@ 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 \
\

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

@@ -9,8 +9,6 @@ Setup new image:
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

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

@@ -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

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

View File

@@ -1,8 +1,23 @@
[Configuration]
ColorForeground=#ffffffffffff
ColorBackground=#000000000000
ColorCursor=#a0a0a0a0a0a0
FontName=Monospace 10
MiscAlwaysShowTabs=FALSE
MiscBell=FALSE
MiscBordersDefault=TRUE
MiscCursorBlinks=FALSE
MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
MiscDefaultGeometry=80x24
MiscInheritGeometry=FALSE
MiscMenubarDefault=FALSE
MiscToolbarDefault=FALSE
MiscConfirmClose=FALSE
MiscMouseAutohide=FALSE
MiscToolbarDefault=TRUE
MiscConfirmClose=TRUE
MiscCycleTabs=TRUE
MiscTabCloseButtons=TRUE
MiscTabCloseMiddleClick=TRUE
MiscTabPosition=GTK_POS_TOP
MiscHighlightUrls=TRUE
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

@@ -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,6 +14,7 @@
<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"/>
@@ -52,17 +53,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 +85,7 @@
<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-12" type="string" value="systemload"/>
<property name="plugin-7" type="string" value="xfce4-sensors-plugin"/>
</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

@@ -24,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,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

@@ -0,0 +1,38 @@
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

@@ -24,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

@@ -18,14 +18,8 @@ IMAGE_INSTALL += " \
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

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

View File

@@ -7,4 +7,4 @@ IMAGE_INSTALL += " \
packagegroup-gui-full \
"
IMAGE_LINGUAS:libc-glibc = "${IMAGE_LINGUAS_FULL}"
IMAGE_LINGUAS_libc-glibc = "${IMAGE_LINGUAS_FULL}"

View File

@@ -6,4 +6,4 @@ IMAGE_INSTALL += " \
packagegroup-gui-full \
"
IMAGE_LINGUAS:libc-glibc = "${IMAGE_LINGUAS_FULL}"
IMAGE_LINGUAS_libc-glibc = "${IMAGE_LINGUAS_FULL}"

View File

@@ -7,4 +7,4 @@ IMAGE_INSTALL += " \
qpdfview \
"
IMAGE_INSTALL:remove = "evince"
IMAGE_INSTALL_remove = "evince"

View File

@@ -2,12 +2,9 @@ SUMMARY = "All packages required for a base image"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
# fontconfig packages get dynamically renamed
PACKAGE_ARCH = "${TUNE_PKGARCH}"
inherit packagegroup
RDEPENDS:${PN} = " \
RDEPENDS_${PN} = " \
ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-common \
ttf-liberation-sans ttf-liberation-mono ttf-liberation-serif \
\

View File

@@ -2,12 +2,9 @@ SUMMARY = "All packages required for a dev image"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
# json-glib gets dynamically renamed
PACKAGE_ARCH = "${TUNE_PKGARCH}"
inherit packagegroup
RDEPENDS:${PN} = " \
RDEPENDS_${PN} = " \
qt5-creator qtwebengine-dev \
qtquickcontrols2-examples qtwayland-examples \
hexedit \
@@ -24,14 +21,14 @@ RDEPENDS:${PN} = " \
automake autoconf libtool m4 \
gcc-symlinks g++-symlinks cpp-symlinks libgomp-dev \
dtc \
pkgconfig binutils-symlinks elfutils gnu-config util-linux \
pkgconfig binutils-symlinks elfutils gnu-config \
gdb gdbserver \
valgrind \
git git-bash-completion git-perltools subversion \
python3-core \
perl php vala lua php json-glib \
texinfo gettext \
patch quilt ncurses dialog kdialog \
patch quilt ncurses dialog \
man man-pages \
gawk \
chrpath \
@@ -45,15 +42,15 @@ RDEPENDS:${PN} = " \
nfs-utils-client \
lmsensors-sensord lmsensors-sensorsdetect \
\
pulseview qtiohelper minicom i2c-tools \
python3-pyserial python3-smbus python3-smbus2 python3-spidev \
pulseview qtiohelper \
\
epiphany ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
${@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', 'rubygems', 'rubygems-jekyll', '', d)} \
"
RDEPENDS:${PN}:append:rpi = "rpi-gpio"
RDEPENDS_${PN}_append_libc-glibc = " \
glibc-utils \
"
# qemu
#

View File

@@ -2,15 +2,12 @@ SUMMARY = "All packages required for a full image"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
# qwt-qt5-examples package gets dynamically renamed
PACKAGE_ARCH = "${TUNE_PKGARCH}"
inherit packagegroup
MACHINE_SPECIFICS_FULL = ""
MACHINE_SPECIFICS_FULL_mx6 = "gstreamer1.0-plugins-imx"
RDEPENDS:${PN} = " \
RDEPENDS_${PN} = " \
source-han-sans-cn-fonts \
source-han-sans-kr-fonts \
source-han-sans-jp-fonts \
@@ -30,7 +27,6 @@ RDEPENDS:${PN} = " \
gnome-disk-utility \
\
mpd \
mpv \
vlc \
parole gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-omx gstreamer1.0-libav \
gstreamer1.0-plugins-base-meta gstreamer1.0-plugins-good-meta \
@@ -41,13 +37,13 @@ RDEPENDS:${PN} = " \
\
${MACHINE_SPECIFICS_FULL} \
\
epiphany ${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'browser-layer chromium-browser-layer', 'chromium-x11', '', d)} \
\
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'meta-retro-world', '', 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 inkscape scribus abiword-meta', '', 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 pinball pinball-table-gnu pinball-table-hurd', '', 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-musicians', 'packagegroup-gui-musicians', '', d)} \
\
@@ -59,4 +55,5 @@ RDEPENDS:${PN} = " \
# firefox
# gursormaker
# kodi
# mpv

View File

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
inherit packagegroup
# Those listed here are either ugly or nonworking
RDEPENDS:${PN} = " \
RDEPENDS_${PN} = " \
atanks \
etr \
gnome-chess \
@@ -13,6 +13,7 @@ RDEPENDS:${PN} = " \
\
gnome-games \
mog \
openastromenace \
"

View File

@@ -2,12 +2,9 @@ SUMMARY = "All packages required for musician image"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
# fluidsynth-bin gets dynamically renamed
PACKAGE_ARCH = "${TUNE_PKGARCH}"
inherit packagegroup
RDEPENDS:${PN} = " \
RDEPENDS_${PN} = " \
musicians-world \
mixxx \
qmmp \

View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
inherit packagegroup
RDEPENDS:${PN} = " \
RDEPENDS_${PN} = " \
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-initramfs', 'plymouth plymouth-set-default-theme plymouth-initrd', '', d)} \
xdg-user-dirs \
\

View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
inherit packagegroup
RDEPENDS:${PN} = " \
RDEPENDS_${PN} = " \
kate \
dolphin \
konsole \

View File

@@ -10,6 +10,11 @@ IMAGE_INSTALL += " \
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 \

View File

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

View File

@@ -18,4 +18,4 @@ do_install() {
}
RDEPENDS:${PN} = "ranpwd"
RDEPENDS_${PN} = "ranpwd"

View File

@@ -7,7 +7,7 @@ PV = "1.2+git${SRCPV}"
inherit autotools
SRC_URI = "git://github.com/koenkooi/ranpwd.git;protocol=https;branch=master \
SRC_URI = "git://github.com/koenkooi/ranpwd.git;protocol=https \
file://ranpwd_confgure.patch \
"
@@ -15,7 +15,7 @@ SRCREV = "b62aab579e288715b82d5575befaa2b8ff210c2b"
S="${WORKDIR}/git"
do_configure:prepend () {
do_configure_prepend () {
( cd ${S}
touch NEWS README AUTHORS ChangeLog
if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then

View File

@@ -12,8 +12,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
# Feel free to add more...
BOOTPARTSPEC = "boot,vfat BOOT,vfat"
# Both raspi layers thip theit own rule
BOOTPARTSPEC_rpi = ""
BOOTPARTSPEC_rpi = "rpi*,vfat"
do_install () {
install -d ${D}${nonarch_base_libdir}/udev/rules.d
@@ -60,4 +59,4 @@ do_install () {
done
}
FILES:${PN} = "${nonarch_base_libdir}/udev/rules.d"
FILES_${PN} = "${nonarch_base_libdir}/udev/rules.d"

View File

@@ -83,7 +83,8 @@ SelectCardDevice() {
ErrorOut 'Cancel selected at SelectCardDevice().'
fi
DevicePath=${DevicePathArr[$menuitem]}
DeviceSize=`lsblk --nodeps --raw --noheadings --output SIZE --bytes $dev`
DeviceSize=`lsblk --nodeps --raw --noheadings --output SIZE --bytes $DevicePath`
unset menuitem
unset menuitems
fi
@@ -98,13 +99,15 @@ SelectCardDevice() {
# DeployFileDir: Path of the file selected
SelectDeployedFile() {
if [ -z "$DeployedFile" ]; then
GetBitbakeEnvVar "TMPDIR"
_TMPDIR="$BitbakeEnvVar"
if [ -z "$BITBAKE_TMPDIR" ]; then
GetBitbakeEnvVar "TMPDIR"
BITBAKE_TMPDIR="$BitbakeEnvVar"
fi
# bitbake environment found?
if [ -z "$_TMPDIR" ]; then
if [ -z "$BITBAKE_TMPDIR" ]; then
ErrorOut "Bitbake environment variable TMPDIR not found!"
fi
DeployPath=${_TMPDIR}/deploy/images/${Machine}
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?"

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 oflag=nocache bs=1024K" "$StartMessage"
EvalExAuto "gunzip -c $DeployedFile | dd of=$DevicePath status=progress oflag=nocache bs=1024K" "$StartMessage"
elif echo $DeployedFile | grep -q '.wic.xz'; then
EvalExAuto "tar -x -f $DeployedFile --to-stdout | dd of=$DevicePath oflag=nocache bs=1024K" "$StartMessage"
EvalExAuto "tar -x -f $DeployedFile --to-stdout | dd of=$DevicePath status=progress oflag=nocache bs=1024K" "$StartMessage"
else
EvalExAuto "dd of=$DevicePath oflag=nocache if=$DeployedFile bs=1024K" "$StartMessage"
EvalExAuto "dd of=$DevicePath status=progress 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 oflag=nocache bs=1024K" "$StartMessage"
EvalExAuto "gunzip -c $DeployedFile | dd of=$DevicePath status=progress oflag=nocache bs=1024K" "$StartMessage"
else
EvalExAuto "dd of=$DevicePath oflag=nocache if=$DeployedFile bs=1024K" "$StartMessage"
EvalExAuto "dd of=$DevicePath status=progress oflag=nocache if=$DeployedFile bs=1024K" "$StartMessage"
fi
# resize I
EvalExAuto "parted -s $DevicePath -- resizepart 2 -0" "\nResize I ${DevicePath}2..."

View File

@@ -1,14 +1,14 @@
#! /bin/bash
# machine-raspberrypi.inc
# (c) Copyright 2021 Andreas Müller <schnitzeltony@gmail.com>
# (c) Copyright 2018 Andreas Müller <schnitzeltony@gmail.com>
# Licensed under terms of GPLv2
#
# This script contains settings and callbacks fir raspberrypi boards
# default settings
DEFAULT_MACHINE_FAMILY='raspberrypi*'
DEFAULT_FIND_ROOTFS='-name *.rpi-sdimg -type l -o -name *.wic -type l -o -name *.wic.bz2 -type l'
DEFAULT_FIND_ROOTFS='-name *.rpi-sdimg -type l'
DEFAULT_KERNEL_IMAGE_TYPE='Image'
# callback for card-write
@@ -18,12 +18,7 @@ RootCardWriteCallback() {
# evt. write partition table
CheckPartitionTable "$DevicePath"
# write
StartMessage="\nWrite $DeployedFile to $DevicePath..."
if echo $DeployedFile | grep -q '.wic.bz2'; then
EvalExAuto "bunzip2 -c $DeployedFile | dd of=$DevicePath oflag=nocache bs=1024K" "$StartMessage"
else
EvalExAuto "dd of=$DevicePath oflag=nocache if=$DeployedFile bs=1024K" "$StartMessage"
fi
EvalExAuto "dd of=$DevicePath status=progress 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

@@ -38,7 +38,7 @@ echo -e "${style_bold}Run bitbake -k --runall=fetch $@...${style_normal}"
bitbake -k --runall=fetch "$@" 2>&1 | while read line; do
if echo "$line" | grep -q "was expected"; then
# Shorten line to ensure not being confused by filenames containing spaces
line=`echo "$line" | sed 's:.*checksum ::' | sed "s:'::g"`
line=`echo "$line" | sed 's:.*checksum ::'`
# Extract checksums
newchecksum=`echo "$line" | awk '{print $1}'`
oldchecksum=`echo "$line" | awk '{print $3}'`