diff options
39 files changed, 66 insertions, 417 deletions
diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel/panel.conf b/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel/panel.conf deleted file mode 100644 index 4b98b39..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel/panel.conf +++ /dev/null @@ -1,118 +0,0 @@ -[General] -__userfile__=true - -[desktopswitch] -alignment=Left -type=desktopswitch - -[mainmenu] -alignment=Left -type=mainmenu - -[mount] -alignment=Right -type=mount - -[panel1] -alignment=-1 -animation-duration=0 -background-color=@Variant(\0\0\0\x43\0\xff\xff\0\0\0\0\0\0\0\0) -background-image= -desktop=0 -font-color=@Variant(\0\0\0\x43\0\xff\xff\0\0\0\0\0\0\0\0) -hidable=false -iconSize=22 -lineCount=1 -lockPanel=false -opacity=100 -panelSize=32 -plugins=mainmenu, desktopswitch, quicklaunch, taskbar, tray, statusnotifier, mount, volume, clock, showdesktop, sensors, sysstat, worldclock2 -position=Bottom -reserve-space=true -show-delay=0 -width=100 -width-percent=true - -[quicklaunch] -alignment=Left -apps\1\desktop=/usr/share/applications/pcmanfm-qt.desktop -apps\2\desktop=/usr/share/applications/qterminal.desktop -apps\size=2 -type=quicklaunch - -[sensors] -alignment=Right -chips\imx_thermal_zone-virtual-0\temp1\color=#628cb2 -chips\imx_thermal_zone-virtual-0\temp1\enabled=true -tempBarWidth=8 -type=sensors -updateInterval=1 -useFahrenheitScale=false -warningAboutHighTemperature=true - -[showdesktop] -alignment=Right -type=showdesktop - -[statusnotifier] -alignment=Right -type=statusnotifier - -[sysstat] -alignment=Right -cpu\frequencyColour=#808080 -cpu\niceColour=#008000 -cpu\otherColour=#808000 -cpu\systemColour=#800000 -cpu\useFrequency=false -cpu\userColour=#00ff7f -data\source=cpu -data\type=CPU -graph\minimalSize=30 -graph\updateInterval=1 -graph\useThemeColours=false -grid\colour=#808080 -grid\lines=1 -mem\appsColour=#000080 -mem\buffersColour=#008000 -mem\cachedColour=#808000 -mem\swapColour=#800000 -net\logarithmicScale=true -net\logarithmicScaleSteps=4 -net\maximumSpeed=1 MB/s -net\receivedColour=#000080 -net\transmittedColour=#808000 -title\colour=#000000 -title\label= -type=sysstat - -[taskbar] -alignment=Left -autoRotate=true -buttonHeight=100 -buttonStyle=IconText -buttonWidth=200 -closeOnMiddleClick=true -cycleOnWheelScroll=true -groupingEnabled=true -iconByClass=false -raiseOnCurrentDesktop=false -showDesktopNum=0 -showGroupOnHover=true -showOnlyCurrentScreenTasks=false -showOnlyMinimizedTasks=false -showOnlyOneDesktopTasks=false -type=taskbar - -[tray] -alignment=Right -type=tray - -[volume] -alignment=Right -audioEngine=Alsa -type=volume - -[worldclock2] -alignment=Right -type=worldclock diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel_%.bbappend b/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel_%.bbappend deleted file mode 100644 index 8d437cb..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel_%.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/lxqt-panel:" - -# add some widgets, add some applications to quicklaunch by injecting -# panel.conf configured on the target - -SRC_URI += "file://panel.conf" -do_configure:prepend () { - cp ${WORKDIR}/panel.conf ${S}/panel/resources/ -} diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session/0001-session.conf-add-qterminal-as-default-terminal.patch b/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session/0001-session.conf-add-qterminal-as-default-terminal.patch deleted file mode 100644 index f4ecae4..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session/0001-session.conf-add-qterminal-as-default-terminal.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d75c0cc25075b78730a4ef29823d6fabe2d46a6b Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Tue, 2 Jan 2018 10:44:43 +0100 -Subject: [PATCH] session.conf: add qterminal as default terminal - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - config/session.conf | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/config/session.conf b/config/session.conf -index ded6aa8..c0aacf5 100644 ---- a/config/session.conf -+++ b/config/session.conf -@@ -3,8 +3,10 @@ window_manager=openbox - leave_confirmation=true - - [Environment] -+BROWSER= - GTK_CSD=0 - GTK_OVERLAY_SCROLLING=0 -+TERM=qterminal - - [Mouse] - cursor_size=18 --- -2.13.6 - diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session_%.bbappend b/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session_%.bbappend deleted file mode 100644 index c3b8be2..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/lxqt-session:" - -SRC_URI += "file://0001-session.conf-add-qterminal-as-default-terminal.patch" diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6D.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6D.png Binary files differdeleted file mode 100755 index 5f145d3..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6D.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6Q.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6Q.png Binary files differdeleted file mode 100755 index 72623c1..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6Q.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF50.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF50.png Binary files differdeleted file mode 100644 index d28e967..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF50.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF61.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF61.png Binary files differdeleted file mode 100644 index 404ae0f..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF61.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6DL.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6DL.png Binary files differdeleted file mode 100644 index 37e8c2f..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6DL.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6S.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6S.png Binary files differdeleted file mode 100644 index faca0ad..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6S.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6ULL.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6ULL.png Binary files differdeleted file mode 100644 index 7fc1228..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6ULL.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7D.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7D.png Binary files differdeleted file mode 100644 index c0fb9a1..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7D.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7S.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7S.png Binary files differdeleted file mode 100644 index 18d671d..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7S.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_Toradex.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_Toradex.png Binary files differdeleted file mode 100644 index dc56b11..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_Toradex.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend deleted file mode 100644 index f88e38b..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend +++ /dev/null @@ -1,90 +0,0 @@ -WALLPAPER-MACHINE = "Wallpaper_Toradex.png" -WALLPAPER-MACHINE:colibri-imx6ull = "Wallpaper_ColibriiMX6ULL.png" -WALLPAPER-MACHINE:colibri-imx6ull-emmc = "Wallpaper_ColibriiMX6ULL.png" -WALLPAPER-MACHINE:colibri-imx7-emmc = "Wallpaper_ColibriiMX7D.png" - -FILESEXTRAPATHS:prepend := "${THISDIR}/lxqt-themes:" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SRC_URI += " \ - file://Wallpaper_Toradex.png \ - file://${WALLPAPER-MACHINE} \ -" - -# for apalis-imx6/colibri-imx6, we decide on the target during postinst -SRC_URI:append:apalis-imx6 += " \ - file://Wallpaper_ApalisiMX6D.png \ - file://Wallpaper_ApalisiMX6Q.png \ -" -SRC_URI:append:colibri-imx6 += " \ - file://Wallpaper_ColibriiMX6DL.png \ - file://Wallpaper_ColibriiMX6S.png \ -" - -# for colibri-imx7 we decide on the target during postinst -SRC_URI:append:colibri-imx7 += " \ - file://Wallpaper_ColibriiMX7D.png \ - file://Wallpaper_ColibriiMX7S.png \ -" -SRC_URI:append:colibri-imx7-emmc += " \ - file://Wallpaper_ColibriiMX7D.png \ -" - -do_install:append () { - install -m 0755 -d ${D}/${datadir}/lxqt/themes/toradex - install -m 0644 ${WORKDIR}/Wallpaper*.png ${D}/${datadir}/lxqt/themes/toradex - ln -sf ${WALLPAPER-MACHINE} ${D}/${datadir}/lxqt/themes/toradex/toradex.png -} - -pkg_postinst_ontarget:${PN}:apalis-imx6 () { - CORES=`grep -c processor /proc/cpuinfo` - case $CORES in - 4) - ln -sf Wallpaper_ApalisiMX6Q.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - 2) - ln -sf Wallpaper_ApalisiMX6D.png ${datadir}/lxqt/themes/toradex/toradex.png - fi - ;; - *) - ln -sf Wallpaper_Toradex.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - esac -} -pkg_postinst_ontarget:${PN}:colibri-imx6 () { - CORES=`grep -c processor /proc/cpuinfo` - case $CORES in - 2) - ln -sf Wallpaper_ColibriiMX6DL.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - 1) - ln -sf Wallpaper_ColibriiMX6S.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - *) - ln -sf Wallpaper_Toradex.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - esac -} - -pkg_postinst_ontarget:${PN}:colibri-imx7 () { -# Currently the soc bus subsystem seems not to work on i.MX 7Solo -# SOC_TYPE=`cat /sys/bus/soc/devices/soc0/soc_id` -# if [ "x$SOC_TYPE" = "xi.MX7D" ]; then -# ln -sf Wallpaper_ColibriiMX7D.png ${datadir}/lxqt/themes/toradex/toradex.png -# else -# ln -sf Wallpaper_ColibriiMX7S.png ${datadir}/lxqt/themes/toradex/toradex.png -# fi - CORES=`grep -c processor /proc/cpuinfo` - case $CORES in - 2) - ln -sf Wallpaper_ColibriiMX7D.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - 1) - ln -sf Wallpaper_ColibriiMX7S.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - *) - ln -sf Wallpaper_Toradex.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - esac -} diff --git a/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt/0001-settings.conf.in-change-to-use-a-toradex-wallpaper.patch b/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt/0001-settings.conf.in-change-to-use-a-toradex-wallpaper.patch deleted file mode 100644 index cffad50..0000000 --- a/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt/0001-settings.conf.in-change-to-use-a-toradex-wallpaper.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 12a1469fa171f5d0e50b536a6e073ea5ca45a152 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Wed, 3 Jan 2018 14:33:37 +0100 -Subject: [PATCH] settings.conf.in: change to use a toradex wallpaper - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - config/pcmanfm-qt/lxqt/settings.conf.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/config/pcmanfm-qt/lxqt/settings.conf.in b/config/pcmanfm-qt/lxqt/settings.conf.in -index b7ef002..70a1d18 100644 ---- a/config/pcmanfm-qt/lxqt/settings.conf.in -+++ b/config/pcmanfm-qt/lxqt/settings.conf.in -@@ -14,9 +14,9 @@ SingleClick=false - ConfirmDelete=true - - [Desktop] --WallpaperMode=stretch --Wallpaper=@LXQT_SHARE_DIR@/themes/frost/lxqt-origami-light.png --BgColor=#000000 -+WallpaperMode=center -+Wallpaper=@LXQT_SHARE_DIR@/themes/toradex/toradex.png -+BgColor=#00508c - FgColor=#ffffff - ShadowColor=#000000 - ShowHidden=false --- -2.13.6 - diff --git a/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_%.bbappend b/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_%.bbappend deleted file mode 100644 index 13ce53d..0000000 --- a/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/pcmanfm-qt:" - -SRC_URI += "file://0001-settings.conf.in-change-to-use-a-toradex-wallpaper.patch" diff --git a/meta-qt5-extra/recipes-misc/sddm/files/sddm.conf b/meta-qt5-extra/recipes-misc/sddm/files/sddm.conf deleted file mode 100644 index 720f45c..0000000 --- a/meta-qt5-extra/recipes-misc/sddm/files/sddm.conf +++ /dev/null @@ -1,120 +0,0 @@ -[Autologin] -# Whether sddm should automatically log back into sessions when they exit -Relogin=false - -# Name of session file for autologin session (if empty try last logged in) -Session=lxqt - -# Username for autologin session -User=root - - -[General] -# Halt command -HaltCommand=/usr/bin/systemctl poweroff - -# Input method module -InputMethod= - -# Initial NumLock state. Can be on, off or none. -# If property is set to none, numlock won't be changed -# NOTE: Currently ignored if autologin is enabled. -Numlock=none - -# Reboot command -RebootCommand=/usr/bin/systemctl reboot - - -[Theme] -# Current theme name -Current= - -# Cursor theme used in the greeter -CursorTheme= - -# Number of users to use as threshold -# above which avatars are disabled -# unless explicitly enabled with EnableAvatars -DisableAvatarsThreshold=7 - -# Enable display of custom user avatars -EnableAvatars=true - -# Global directory for user avatars -# The files should be named <username>.face.icon -FacesDir=/usr/share/sddm/faces - -# Theme directory path -ThemeDir=/usr/share/sddm/themes - - -[Users] -# Default $PATH for logged in users -DefaultPath=/bin:/usr/bin:/usr/local/bin - -# Comma-separated list of shells. -# Users with these shells as their default won't be listed -HideShells=/bin/sync,/bin/false,/bin/nologin,/usr/sbin/ppp-dialin - -# Comma-separated list of users that should not be listed -HideUsers=daemon,bin,sys,games,man,lp,mail,news,uucp,proxy,www-data,backup,list,irc,gnats,polkitd - -# Maximum user id for displayed users -MaximumUid=60000 - -# Minimum user id for displayed users -MinimumUid=0 - -# Remember the session of the last successfully logged in user -RememberLastSession=true - -# Remember the last successfully logged in user -RememberLastUser=true - - -[Wayland] -# Path to a script to execute when starting the desktop session -SessionCommand=/usr/share/sddm/scripts/wayland-session - -# Directory containing available Wayland sessions -SessionDir=/usr/share/wayland-sessions - -# Path to the user session log file -SessionLogFile=.local/share/sddm/wayland-session.log - - -[X11] -# Path to a script to execute when starting the display server -DisplayCommand=/usr/share/sddm/scripts/Xsetup - -# Path to a script to execute when stopping the display server -DisplayStopCommand=/usr/share/sddm/scripts/Xstop - -# The lowest virtual terminal number that will be used. -MinimumVT=1 - -# Arguments passed to the X server invocation -ServerArguments=-nolisten tcp - -# Path to X server binary -ServerPath=/usr/bin/X - -# Path to a script to execute when starting the desktop session -SessionCommand=/usr/share/sddm/scripts/Xsession - -# Directory containing available X sessions -SessionDir=/usr/share/xsessions - -# Path to the user session log file -SessionLogFile=.local/share/sddm/xorg-session.log - -# Path to the Xauthority file -UserAuthFile=.Xauthority - -# Path to xauth binary -XauthPath=/usr/bin/xauth - -# Path to Xephyr binary -XephyrPath=/usr/bin/Xephyr - - diff --git a/meta-qt5-extra/recipes-misc/sddm/sddm_%.bbappend b/meta-qt5-extra/recipes-misc/sddm/sddm_%.bbappend deleted file mode 100644 index 8802adb..0000000 --- a/meta-qt5-extra/recipes-misc/sddm/sddm_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" diff --git a/qt5-layer/recipes-qt/examples/cinematicexperience/fix-fullscreen-mode.patch b/qt5-layer/recipes-qt/examples/cinematicexperience/fix-fullscreen-mode.patch index a82dc40..4bb069f 100644 --- a/qt5-layer/recipes-qt/examples/cinematicexperience/fix-fullscreen-mode.patch +++ b/qt5-layer/recipes-qt/examples/cinematicexperience/fix-fullscreen-mode.patch @@ -1,3 +1,4 @@ +Upstream-Status: Pending --- a/main.cpp 2022-11-16 15:25:11.221100107 +0100 +++ b/main.cpp 2022-11-18 09:30:01.084064039 +0100 @@ -1,5 +1,22 @@ diff --git a/qt5-layer/recipes-qt/qt5/qt3d/0001-qt3d-do-not-set-resources_big.patch b/qt5-layer/recipes-qt/qt5/qt3d/0001-qt3d-do-not-set-resources_big.patch index d2c143f..225d858 100644 --- a/qt5-layer/recipes-qt/qt5/qt3d/0001-qt3d-do-not-set-resources_big.patch +++ b/qt5-layer/recipes-qt/qt5/qt3d/0001-qt3d-do-not-set-resources_big.patch @@ -15,6 +15,7 @@ see also: https://bugreports.qt.io/browse/QTBUG-41301?focusedCommentId=255692&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel (the default is now 1 pass and 2 pass needs to be configured in CONFIG with ressource_big) +Upstream-Status: Pending Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> --- examples/qt3d/examples.pri | 2 +- diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index 83eeb1a..628516e 100644 --- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -28,9 +28,11 @@ SRC_URI:append = " \ file://qt5-${IMX_BACKEND}.sh \ " +OURFILEPATH = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" + do_install:append () { install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${WORKDIR}/qt5-${IMX_BACKEND}.sh ${D}${sysconfdir}/profile.d/ + install -m 0755 ${OURFILEPATH}/qt5-${IMX_BACKEND}.sh ${D}${sysconfdir}/profile.d/ } diff --git a/recipes-benchmark/clpeak/clpeak/0001-CMakeLists-add-install-rule.patch b/recipes-benchmark/clpeak/clpeak/0001-CMakeLists-add-install-rule.patch index 68f0762..c624658 100644 --- a/recipes-benchmark/clpeak/clpeak/0001-CMakeLists-add-install-rule.patch +++ b/recipes-benchmark/clpeak/clpeak/0001-CMakeLists-add-install-rule.patch @@ -3,6 +3,7 @@ From: Max Krummenacher <max.krummenacher@toradex.com> Date: Wed, 17 Oct 2018 09:31:08 +0000 Subject: [PATCH] CMakeLists: add install rule +Upstream-Status: Pending Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> --- CMakeLists.txt | 1 + diff --git a/recipes-benchmark/cpuburn/cpuburn-a53_git.bb b/recipes-benchmark/cpuburn/cpuburn-a53_git.bb index fe9aa24..08e02aa 100644 --- a/recipes-benchmark/cpuburn/cpuburn-a53_git.bb +++ b/recipes-benchmark/cpuburn/cpuburn-a53_git.bb @@ -19,8 +19,7 @@ SRC_URI[ssvb.sha256sum] = "ce42ebdc71c876a33d9f7534355ef76cefa0d00ddb19ad69cf05a SRC_URI[ssvb53.md5sum] = "a32d75f7e1fa9afbb887bef71d89875a" SRC_URI[ssvb53.sha256sum] = "502b3a17186da34976cb97d7ae2083a66c42cddaffc1e900a4dd23efc64d97f1" - -S = "${WORKDIR}" +S = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" do_compile() { ${CC} ${CFLAGS} ${LDFLAGS} burn.S -o burn diff --git a/recipes-connectivity/hostapd-example/hostapd-example.bb b/recipes-connectivity/hostapd-example/hostapd-example.bb index 17f52e8..62e1bf3 100644 --- a/recipes-connectivity/hostapd-example/hostapd-example.bb +++ b/recipes-connectivity/hostapd-example/hostapd-example.bb @@ -6,7 +6,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" RDEPENDS:${PN} = "hostapd" -S = "${WORKDIR}" +S = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" SRC_URI = " \ file://enable-wifi.service \ diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend index 8faabfb..0b06e5b 100644 --- a/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/recipes-core/base-files/base-files_3.0.14.bbappend @@ -5,10 +5,15 @@ SRC_URI += " \ file://x11-display-var.sh \ " +OURFILEPATH = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" + do_install:append () { install -m 0755 -d ${D}${sysconfdir}/profile.d - install -m 0644 ${WORKDIR}/disable_systemd_coloroutput.sh ${D}${sysconfdir}/profile.d/ - install -m 0644 ${WORKDIR}/x11-display-var.sh ${D}${sysconfdir}/profile.d/ + install -m 0644 ${OURFILEPATH}/disable_systemd_coloroutput.sh ${D}${sysconfdir}/profile.d/ + install -m 0644 ${OURFILEPATH}/x11-display-var.sh ${D}${sysconfdir}/profile.d/ + # Make /media a symbolic link to /run/media + rmdir ${D}/media + ln -sf run/media ${D}/media } BASEFILESISSUEINSTALL = "" diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend index 802daa2..e6cb9bc 100644 --- a/recipes-core/systemd/systemd_%.bbappend +++ b/recipes-core/systemd/systemd_%.bbappend @@ -2,6 +2,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/systemd:" SRC_URI += "file://rndis.network" +OURFILEPATH = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" + PACKAGECONFIG:append = " networkd" PACKAGECONFIG[acl] = "-Dacl=true,-Dacl=false,acl" @@ -9,7 +11,7 @@ PACKAGECONFIG[acl] = "-Dacl=true,-Dacl=false,acl" do_install:append() { # The network files need to be in /usr/lib/systemd, not ${systemd_unitdir}... install -d ${D}${prefix}/lib/systemd/network/ - install -m 0644 ${WORKDIR}/rndis.network ${D}${prefix}/lib/systemd/network/ + install -m 0644 ${OURFILEPATH}/rndis.network ${D}${prefix}/lib/systemd/network/ } FILES:${PN} += " \ diff --git a/recipes-core/systemd/timestamp-service.bb b/recipes-core/systemd/timestamp-service.bb index 914e610..676a153 100644 --- a/recipes-core/systemd/timestamp-service.bb +++ b/recipes-core/systemd/timestamp-service.bb @@ -8,13 +8,15 @@ SRC_URI = "file://timestamp.service \ file://load-timestamp.sh \ " +S = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" + do_install () { install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/load-timestamp.sh ${D}/${bindir} + install -m 0755 ${S}/load-timestamp.sh ${D}/${bindir} install -d ${D}/${base_libdir}/systemd/system - install -m 0644 ${WORKDIR}/timestamp.service ${D}/${base_libdir}/systemd/system/ + install -m 0644 ${S}/timestamp.service ${D}/${base_libdir}/systemd/system/ } SYSTEMD_PACKAGES = "${PN}" diff --git a/recipes-graphics/gpicview/gpicview/0001-Add-missing-return-value.patch b/recipes-graphics/gpicview/gpicview/0001-Add-missing-return-value.patch new file mode 100644 index 0000000..bdd40d4 --- /dev/null +++ b/recipes-graphics/gpicview/gpicview/0001-Add-missing-return-value.patch @@ -0,0 +1,28 @@ +From f7f8e64a78de237825bec9a54906d2b120ecc9f1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ingo=20Br=C3=BCckl?= <ib@wupperonline.de> +Date: Mon, 17 Jul 2023 14:52:07 +0200 +Subject: [PATCH] Add missing return value + +Based on https://sourceforge.net/p/lxde/patches/460. + +Upstream-Status: Backport [https://github.com/lxde/gpicview/commit/f7f8e64a78de237825bec9a54906d2b120ecc9f1] +--- + src/main-win.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main-win.c b/src/main-win.c +index 32f6433..09eeb34 100644 +--- a/src/main-win.c ++++ b/src/main-win.c +@@ -378,7 +378,7 @@ gboolean main_win_open( MainWin* mw, const char* file_path, ZoomMode zoom ) + image_list_sort_by_name( mw->img_list, GTK_SORT_DESCENDING ); + if (image_list_get_first(mw->img_list)) + main_win_open(mw, image_list_get_current_file_path(mw->img_list), zoom); +- return; ++ return TRUE; + } + + +-- +2.42.0 + diff --git a/recipes-graphics/gpicview/gpicview_0.2.5.bb b/recipes-graphics/gpicview/gpicview_0.2.5.bb index 170db77..0ba6a1e 100644 --- a/recipes-graphics/gpicview/gpicview_0.2.5.bb +++ b/recipes-graphics/gpicview/gpicview_0.2.5.bb @@ -11,6 +11,7 @@ RDEPENDS:${PN} = "adwaita-icon-theme" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/lxde/${P}.tar.xz \ file://0001-gpicview-allow-to-build-for-gtk-wayland.patch \ + file://0001-Add-missing-return-value.patch \ " SRC_URI[md5sum] = "26be9b0c5a234f1afe7d83d02a4a33f4" SRC_URI[sha256sum] = "38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942" diff --git a/recipes-graphics/mesa/mesa-demos/0001-xeglgears-drop-usage-of-fooEXT-functions.patch b/recipes-graphics/mesa/mesa-demos/0001-xeglgears-drop-usage-of-fooEXT-functions.patch index 2f5d88b..0e33c6b 100644 --- a/recipes-graphics/mesa/mesa-demos/0001-xeglgears-drop-usage-of-fooEXT-functions.patch +++ b/recipes-graphics/mesa/mesa-demos/0001-xeglgears-drop-usage-of-fooEXT-functions.patch @@ -9,6 +9,7 @@ With the Vivante implementation they do not exist. Linking thus fails with: | ...mesa-demos-8.4.0/src/egl/opengl/xeglgears.c:928: undefined reference to `glFramebufferRenderbufferEXT' | ...mesa-demos-8.4.0/src/egl/opengl/xeglgears.c:933: undefined reference to `glCheckFramebufferStatusEXT' +Upstream-Status: Pending Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> --- src/egl/opengl/xeglgears.c | 6 +++--- diff --git a/recipes-graphics/scrot/files/0001-pkgconfig-don-t-include-ldflags.patch b/recipes-graphics/scrot/files/0001-pkgconfig-don-t-include-ldflags.patch index 5590085..e8a1fd0 100644 --- a/recipes-graphics/scrot/files/0001-pkgconfig-don-t-include-ldflags.patch +++ b/recipes-graphics/scrot/files/0001-pkgconfig-don-t-include-ldflags.patch @@ -7,6 +7,7 @@ This leaks the cross build environment. Prevents: | ERROR: giblib-1.2.4-r0 do_populate_sysroot: QA Issue: giblib.pc failed sanity test (tmpdir) in path ../giblib/1.2.4-r0/sysroot-destdir/usr/lib/ pkgconfig [pkgconfig] +Upstream-Status: Pending Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> --- giblib.pc.in | 2 +- diff --git a/recipes-graphics/scrot/files/fix-giblib-binconfig-paths.patch b/recipes-graphics/scrot/files/fix-giblib-binconfig-paths.patch index 13b2a81..c28c4e3 100644 --- a/recipes-graphics/scrot/files/fix-giblib-binconfig-paths.patch +++ b/recipes-graphics/scrot/files/fix-giblib-binconfig-paths.patch @@ -1,3 +1,4 @@ +Upstream-Status: Pending --- giblib-1.2.4/giblib-config.in~ 2004-09-04 16:40:40.000000000 +0200 +++ giblib-1.2.4/giblib-config.in 2013-04-24 23:15:55.972080028 +0200 @@ -42,10 +42,10 @@ diff --git a/recipes-graphics/scrot/files/fix-scrot-include-paths.patch b/recipes-graphics/scrot/files/fix-scrot-include-paths.patch index 3476891..b26a05b 100644 --- a/recipes-graphics/scrot/files/fix-scrot-include-paths.patch +++ b/recipes-graphics/scrot/files/fix-scrot-include-paths.patch @@ -1,3 +1,4 @@ +Upstream-Status: Pending diff -Naur scrot-0.8.orig/Makefile.am scrot-0.8/Makefile.am --- scrot-0.8.orig/Makefile.am 2000-10-29 02:44:22.000000000 +0200 +++ scrot-0.8/Makefile.am 2013-04-24 23:31:31.501090024 +0200 diff --git a/recipes-graphics/wayland-app-launch/wayland-app-launch.inc b/recipes-graphics/wayland-app-launch/wayland-app-launch.inc index 588ca4b..7cac13b 100644 --- a/recipes-graphics/wayland-app-launch/wayland-app-launch.inc +++ b/recipes-graphics/wayland-app-launch/wayland-app-launch.inc @@ -7,7 +7,7 @@ inherit allarch systemd RDEPENDS:${PN} += "weston-init ${INITIAL_APP_PKGS}" -S = "${WORKDIR}" +S = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" SRC_URI = " \ file://wayland-app-launch.service.in \ @@ -24,7 +24,7 @@ do_compile () { do_install () { install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/wayland-app-launch.service ${D}${systemd_unitdir}/system + install -m 0644 ${S}/wayland-app-launch.service ${D}${systemd_unitdir}/system } SYSTEMD_PACKAGES = "${PN}" diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index 223eb2c..db05a96 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -2,6 +2,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += "file://toradex-save-touchscreen-calibration.sh" +OURFILEPATH = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" + PACKAGECONFIG[touchscreen-calibration] = ",," PACKAGECONFIG:append:tdx = " touchscreen-calibration" @@ -18,6 +20,6 @@ do_install:append:tdx() { sed -i -e "/enable_tap=/d" ${D}${sysconfdir}/xdg/weston/weston.ini sed -i -e "/^\[libinput\]/a enable_tap=true" ${D}${sysconfdir}/xdg/weston/weston.ini - install -Dm0755 ${WORKDIR}/toradex-save-touchscreen-calibration.sh ${D}${bindir}/toradex-save-touchscreen-calibration + install -Dm0755 ${OURFILEPATH}/toradex-save-touchscreen-calibration.sh ${D}${bindir}/toradex-save-touchscreen-calibration fi } diff --git a/recipes-multimedia/media-files/media-files_1.3.bb b/recipes-multimedia/media-files/media-files_1.3.bb index c51497f..6eb35bd 100644 --- a/recipes-multimedia/media-files/media-files_1.3.bb +++ b/recipes-multimedia/media-files/media-files_1.3.bb @@ -1,6 +1,6 @@ SUMMARY = "Media Files for tests" LICENSE = "CC0-1.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/CC0-1.0;md5=0ceb3372c9595f0a8067e55da801e4a1" +LIC_FILES_CHKSUM = "file://${S}/../CC0-1.0;md5=0ceb3372c9595f0a8067e55da801e4a1" inherit allarch bin_package @@ -8,7 +8,7 @@ SRC_URI = "https://docs1.toradex.com/114780-media-files-${PV}.tar.xz" SRC_URI[sha256sum] = "d6a3cd2003798fec80fb8008d2e48a5fa2c581f4ae66c03cd573d33b18341e67" -S = "${WORKDIR}/media-files" +S = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}/media-files" # Install the files to ${D}${ROOT_HOME} # Source code of original poky function: diff --git a/recipes-sato/webkit/webkitgtk_%.bbappend b/recipes-sato/webkit/webkitgtk_%.bbappend index 6b5c67e..2ed1c89 100644 --- a/recipes-sato/webkit/webkitgtk_%.bbappend +++ b/recipes-sato/webkit/webkitgtk_%.bbappend @@ -1,6 +1,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://minibrowser.desktop" +OURFILEPATH = "${@d.getVar("UNPACKDIR") or '${WORKDIR}'}" + do_install:append() { - install -m 0644 -D ${WORKDIR}/minibrowser.desktop ${D}${datadir}/applications/minibrowser.desktop + install -m 0644 -D ${OURFILEPATH}/minibrowser.desktop ${D}${datadir}/applications/minibrowser.desktop } diff --git a/recipes-support/libfm/files/libfm_set_terminal.patch b/recipes-support/libfm/files/libfm_set_terminal.patch index cab33bc..82dbb5c 100644 --- a/recipes-support/libfm/files/libfm_set_terminal.patch +++ b/recipes-support/libfm/files/libfm_set_terminal.patch @@ -1,3 +1,4 @@ +Upstream-Status: Pending --- libfm-0.1.17/data/libfm.conf.orig 2013-02-05 13:49:33.394176746 +0100 +++ libfm-0.1.17/data/libfm.conf 2013-02-05 13:50:27.464253338 +0100 @@ -2,6 +2,7 @@ |
