PR#884: toolbox crit-path defs - fedora-comps

fedora-comps

#884 toolbox crit-path defs

Closed 8 months ago by sumantrom. Opened 8 months ago by sumantrom.

Unknown source toolbx-critpath into main

sumantrom • 8 months ago

834ecb6

comps-f39.xml.in

file modified

+90 -53

		`@@ -75,7 +75,6 @@`
		`<packagereq arch="aarch64,ppc64le,x86_64" type="mandatory">grub2-tools</packagereq>`
		`<packagereq arch="x86_64" type="mandatory">grub2-tools-efi</packagereq>`
		`<packagereq arch="aarch64,ppc64le,x86_64" type="mandatory">grub2-tools-extra</packagereq>`
		`- <packagereq type="mandatory">grubby</packagereq>`
		`<packagereq type="mandatory">hfsplus-tools</packagereq>`
		`<packagereq type="mandatory">iscsi-initiator-utils</packagereq>`
		`<packagereq type="mandatory">kbd-legacy</packagereq>`
		`@@ -368,8 +367,6 @@`
		`<packagereq type="default">gnome-system-monitor</packagereq>`
		`<packagereq type="default">gnome-terminal</packagereq>`
		`<packagereq type="default">nemo</packagereq>`
		`- <packagereq type="default">nemo-fileroller</packagereq>`
		`- <packagereq type="default">nemo-seahorse</packagereq>`
		`<packagereq type="default">parole</packagereq>`
		`<packagereq arch="aarch64,ppc64le,x86_64" type="default">rhythmbox</packagereq>`
		`<packagereq type="default">seahorse</packagereq>`
		`@@ -633,8 +630,6 @@`
		`<packagereq type="optional">buildah</packagereq>`
		`<packagereq type="optional">flatpak</packagereq>`
		`<packagereq type="optional">flatpak-builder</packagereq>`
		`- <packagereq type="optional">skopeo</packagereq>`
		`- <packagereq type="optional">toolbox</packagereq>`
		`</packagelist>`
		`</group>`
		`<group>`
		`@@ -650,10 +645,11 @@`
		`<packagereq type="mandatory">coreutils</packagereq>`
		`<packagereq type="mandatory">curl</packagereq>`
		`<packagereq type="mandatory">dhcp-client</packagereq>`
		`- <packagereq type="mandatory">dnf</packagereq>`
		`+ <packagereq type="mandatory">dnf5</packagereq>`
		`<packagereq type="mandatory">e2fsprogs</packagereq>`
		`<packagereq type="mandatory">filesystem</packagereq>`
		`<packagereq type="mandatory">glibc</packagereq>`
		`+ <packagereq type="mandatory">grubby</packagereq>`
		`<packagereq type="mandatory">hostname</packagereq>`
		`<packagereq type="mandatory">iproute</packagereq>`
		`<packagereq type="mandatory">iputils</packagereq>`
		`@@ -679,7 +675,7 @@`
		`<packagereq type="mandatory">util-linux</packagereq>`
		`<packagereq type="mandatory">vim-minimal</packagereq>`
		`<packagereq type="mandatory">yum</packagereq>`
		`- <packagereq type="default">dnf-plugins-core</packagereq>`
		`+ <packagereq type="default">dnf5-plugins</packagereq>`
		`<packagereq type="default">dracut-config-rescue</packagereq>`
		`<packagereq type="default">firewalld</packagereq>`
		`<packagereq type="default">fwupd</packagereq>`
		`@@ -691,6 +687,7 @@`
		`<packagereq type="default">systemd-resolved</packagereq>`
		`<packagereq type="default">zram-generator-defaults</packagereq>`
		`<packagereq type="optional">dracut-config-generic</packagereq>`
		`+ <packagereq type="optional">fedora-repos-modular</packagereq>`
		`<packagereq type="optional">initial-setup</packagereq>`
		`<packagereq type="optional">initscripts</packagereq>`
		`<packagereq arch="aarch64" type="optional">uboot-images-armv8</packagereq>`
		`@@ -748,8 +745,6 @@`
		`<uservisible>false</uservisible>`
		`<packagelist>`
		`<packagereq type="mandatory">gcc-c++</packagereq>`
		`- <packagereq type="mandatory">mock</packagereq>`
		`- <packagereq type="mandatory">mock-core-configs</packagereq>`
		`<packagereq type="mandatory">redhat-rpm-config</packagereq>`
		`<packagereq type="mandatory">rpm-build</packagereq>`
		`</packagelist>`
		`@@ -763,8 +758,6 @@`
		`<packagelist>`
		`<packagereq type="mandatory">livesys-scripts</packagereq>`
		`<packagereq type="mandatory">lorax</packagereq>`
		`- <packagereq type="mandatory">mock</packagereq>`
		`- <packagereq type="mandatory">mock-core-configs</packagereq>`
		`<packagereq type="mandatory">pungi</packagereq>`
		`<packagereq type="mandatory">selinux-policy</packagereq>`
		`<packagereq type="mandatory">setup</packagereq>`
		`@@ -811,6 +804,7 @@`
		`<packagereq type="default">gnome-bluetooth</packagereq>`
		`<packagereq type="default">gnome-software</packagereq>`
		`<packagereq type="default">nautilus</packagereq>`
		`+ <packagereq type="default">toolbox</packagereq>`
		`</packagelist>`
		`</group>`
		`<group>`
		`@@ -1642,17 +1636,47 @@`
		`<default>false</default>`
		`<uservisible>false</uservisible>`
		`<packagelist>`
		`- <packagereq type="default">default-fonts-cjk-mono</packagereq>`
		`- <packagereq type="default">default-fonts-cjk-sans</packagereq>`
		`- <packagereq type="default">default-fonts-cjk-serif</packagereq>`
		`- <packagereq type="default">default-fonts-core-emoji</packagereq>`
		`- <packagereq type="default">default-fonts-core-math</packagereq>`
		`- <packagereq type="default">default-fonts-core-mono</packagereq>`
		`- <packagereq type="default">default-fonts-core-sans</packagereq>`
		`- <packagereq type="default">default-fonts-core-serif</packagereq>`
		`- <packagereq type="default">default-fonts-other-mono</packagereq>`
		`- <packagereq type="default">default-fonts-other-sans</packagereq>`
		`- <packagereq type="default">default-fonts-other-serif</packagereq>`
		`+ <packagereq type="default">abattis-cantarell-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-color-emoji-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-naskh-arabic-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-arabic-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-armenian-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-canadian-aboriginal-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-cherokee-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-cjk-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-ethiopic-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-georgian-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-gurmukhi-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-hebrew-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-khmer-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-lao-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-math-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-mono-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-sinhala-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-thaana-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-thai-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-sans-vf-fonts</packagereq>`
		`+ <packagereq type="default">google-noto-serif-vf-fonts</packagereq>`
		`+ <packagereq type="default">jomolhari-fonts</packagereq>`
		`+ <packagereq type="default">liberation-mono-fonts</packagereq>`
		`+ <packagereq type="default">liberation-sans-fonts</packagereq>`
		`+ <packagereq type="default">liberation-serif-fonts</packagereq>`
		`+ <packagereq type="default">lohit-assamese-fonts</packagereq>`
		`+ <packagereq type="default">lohit-bengali-fonts</packagereq>`
		`+ <packagereq type="default">lohit-devanagari-fonts</packagereq>`
		`+ <packagereq type="default">lohit-gujarati-fonts</packagereq>`
		`+ <packagereq type="default">lohit-kannada-fonts</packagereq>`
		`+ <packagereq type="default">lohit-marathi-fonts</packagereq>`
		`+ <packagereq type="default">lohit-odia-fonts</packagereq>`
		`+ <packagereq type="default">lohit-tamil-fonts</packagereq>`
		`+ <packagereq type="default">lohit-telugu-fonts</packagereq>`
		`+ <packagereq type="default">paktype-naskh-basic-fonts</packagereq>`
		`+ <packagereq type="default">rit-meera-new-fonts</packagereq>`
		`+ <packagereq type="default">sil-mingzat-fonts</packagereq>`
		`+ <packagereq type="default">sil-nuosu-fonts</packagereq>`
		`+ <packagereq type="default">sil-padauk-fonts</packagereq>`
		`+ <packagereq type="default">stix-fonts</packagereq>`
		`+ <packagereq type="default">vazirmatn-vf-fonts</packagereq>`
		`<packagereq type="optional">aajohan-comfortaa-fonts</packagereq>`
		`<packagereq type="optional">adf-accanthis-2-fonts</packagereq>`
		`<packagereq type="optional">adf-accanthis-3-fonts</packagereq>`
		`@@ -2198,6 +2222,19 @@`
		`<packagereq type="optional">thai-arundina-sans-fonts</packagereq>`
		`<packagereq type="optional">thai-arundina-sans-mono-fonts</packagereq>`
		`<packagereq type="optional">thai-arundina-serif-fonts</packagereq>`
		`+ <packagereq type="optional">thai-scalable-garuda-fonts</packagereq>`
		`+ <packagereq type="optional">thai-scalable-kinnari-fonts</packagereq>`
		`+ <packagereq type="optional">thai-scalable-laksaman-fonts</packagereq>`
		`+ <packagereq type="optional">thai-scalable-loma-fonts</packagereq>`
		`+ <packagereq type="optional">thai-scalable-norasi-fonts</packagereq>`
		`+ <packagereq type="optional">thai-scalable-purisa-fonts</packagereq>`
		`+ <packagereq type="optional">thai-scalable-sawasdee-fonts</packagereq>`
		`+ <packagereq type="optional">thai-scalable-tlwgmono-fonts</packagereq>`
		`+ <packagereq type="optional">thai-scalable-tlwgtypewriter-fonts</packagereq>`
		`+ <packagereq type="optional">thai-scalable-tlwgtypist-fonts</packagereq>`
		`+ <packagereq type="optional">thai-scalable-tlwgtypo-fonts</packagereq>`
		`+ <packagereq type="optional">thai-scalable-umpush-fonts</packagereq>`
		`+ <packagereq type="optional">thai-scalable-waree-fonts</packagereq>`
		`<packagereq type="optional">thibault-essays1743-fonts</packagereq>`
		`<packagereq type="optional">thibault-isabella-fonts</packagereq>`
		`<packagereq type="optional">thibault-rockets-fonts</packagereq>`
		`@@ -2213,19 +2250,6 @@`
		`<packagereq type="optional">tiresias-sign-z-fonts</packagereq>`
		`<packagereq type="optional">tlomt-league-gothic-fonts</packagereq>`
		`<packagereq type="optional">tlomt-sniglet-fonts</packagereq>`
		`- <packagereq type="optional">tlwg-garuda-fonts</packagereq>`
		`- <packagereq type="optional">tlwg-kinnari-fonts</packagereq>`
		`- <packagereq type="optional">tlwg-laksaman-fonts</packagereq>`
		`- <packagereq type="optional">tlwg-loma-fonts</packagereq>`
		`- <packagereq type="optional">tlwg-mono-fonts</packagereq>`
		`- <packagereq type="optional">tlwg-norasi-fonts</packagereq>`
		`- <packagereq type="optional">tlwg-purisa-fonts</packagereq>`
		`- <packagereq type="optional">tlwg-sawasdee-fonts</packagereq>`
		`- <packagereq type="optional">tlwg-typewriter-fonts</packagereq>`
		`- <packagereq type="optional">tlwg-typist-fonts</packagereq>`
		`- <packagereq type="optional">tlwg-typo-fonts</packagereq>`
		`- <packagereq type="optional">tlwg-umpush-fonts</packagereq>`
		`- <packagereq type="optional">tlwg-waree-fonts</packagereq>`
		`<packagereq type="optional">tulrich-tuffy-fonts</packagereq>`
		`<packagereq type="optional">twitter-twemoji-fonts</packagereq>`
		`<packagereq type="optional">typetype-molot-fonts</packagereq>`
		`@@ -2598,6 +2622,7 @@`
		`<packagereq type="default">avahi</packagereq>`
		`<packagereq type="default">baobab</packagereq>`
		`<packagereq type="default">cheese</packagereq>`
		`+ <packagereq type="default">eog</packagereq>`
		`<packagereq type="default">evince</packagereq>`
		`<packagereq type="default">evince-djvu</packagereq>`
		`<!-- 2022-08: disabled ATM due to no GTK4 port`
		`@@ -2635,7 +2660,6 @@`
		`<packagereq type="default">gvfs-smb</packagereq>`
		`<packagereq type="default">librsvg2</packagereq>`
		`<packagereq type="default">libsane-hpaio</packagereq>`
		`- <packagereq type="default">loupe</packagereq>`
		`<packagereq type="default">mesa-dri-drivers</packagereq>`
		`<packagereq type="default">mesa-libEGL</packagereq>`
		`<packagereq type="default">ModemManager</packagereq>`
		`@@ -2916,13 +2940,26 @@`
		`<packagereq type="default">b43-openfwwf</packagereq>`
		`<packagereq type="default">brcmfmac-firmware</packagereq>`
		`<packagereq type="default">intel-gpu-firmware</packagereq>`
		`- <packagereq type="default">iwlegacy-firmware</packagereq>`
		`- <packagereq type="default">iwlwifi-dvm-firmware</packagereq>`
		`- <packagereq type="default">iwlwifi-mvm-firmware</packagereq>`
		`- <packagereq type="default">libertas-firmware</packagereq>`
		`+ <packagereq type="default">iwl100-firmware</packagereq>`
		`+ <packagereq type="default">iwl1000-firmware</packagereq>`
		`+ <packagereq type="default">iwl105-firmware</packagereq>`
		`+ <packagereq type="default">iwl135-firmware</packagereq>`
		`+ <packagereq type="default">iwl2000-firmware</packagereq>`
		`+ <packagereq type="default">iwl2030-firmware</packagereq>`
		`+ <packagereq type="default">iwl3160-firmware</packagereq>`
		`+ <packagereq type="default">iwl3945-firmware</packagereq>`
		`+ <packagereq type="default">iwl4965-firmware</packagereq>`
		`+ <packagereq type="default">iwl5000-firmware</packagereq>`
		`+ <packagereq type="default">iwl5150-firmware</packagereq>`
		`+ <packagereq type="default">iwl6000-firmware</packagereq>`
		`+ <packagereq type="default">iwl6000g2a-firmware</packagereq>`
		`+ <packagereq type="default">iwl6000g2b-firmware</packagereq>`
		`+ <packagereq type="default">iwl6050-firmware</packagereq>`
		`+ <packagereq type="default">iwl7260-firmware</packagereq>`
		`+ <packagereq type="default">iwlax2xx-firmware</packagereq>`
		`+ <packagereq type="default">libertas-usb8388-firmware</packagereq>`
		`<packagereq type="default">mt7xxx-firmware</packagereq>`
		`<packagereq type="default">nvidia-gpu-firmware</packagereq>`
		`- <packagereq arch="aarch64" type="default">qcom-firmware</packagereq>`
		`<packagereq type="default">realtek-firmware</packagereq>`
		`<packagereq type="default">usb_modeswitch</packagereq>`
		`<packagereq type="optional">acpi</packagereq>`
		`@@ -3051,6 +3088,7 @@`
		`<packagereq type="conditional" requires="gtk4">ibus-gtk4</packagereq>`
		`<packagereq type="conditional" requires="qt">ibus-qt</packagereq>`
		`<packagereq type="conditional" requires="xfce4-panel">im-chooser-xfce</packagereq>`
		`+ <packagereq type="conditional" requires="plasma-desktop">imsettings-plasma</packagereq>`
		`<packagereq type="default">ibus-anthy</packagereq>`
		`<packagereq type="default">ibus-hangul</packagereq>`
		`<packagereq type="default">ibus-libpinyin</packagereq>`
		`@@ -4347,7 +4385,7 @@`
		`<packagereq arch="aarch64,s390x,x86_64">chatty</packagereq>`
		`<packagereq>cryptsetup</packagereq>`
		`<packagereq>default-editor</packagereq>`
		`- <packagereq>dnf</packagereq>`
		`+ <packagereq>dnf5</packagereq>`
		`<packagereq>epiphany</packagereq>`
		`<packagereq>feedbackd</packagereq>`
		`<packagereq>gnome-calculator</packagereq>`
		`@@ -4478,7 +4516,7 @@`
		`<packagereq type="default">make</packagereq>`
		`<packagereq type="default">pipenv</packagereq>`
		`<packagereq type="default">poetry</packagereq>`
		`- <packagereq type="default">pypy3.10-devel</packagereq>`
		`+ <packagereq type="default">pypy3.9-devel</packagereq>`
		`<packagereq type="default">python-launcher</packagereq>`
		`<packagereq type="default">python3-devel</packagereq>`
		`<packagereq type="default">python3-docs</packagereq>`
		`@@ -4544,20 +4582,19 @@`
		`<packagereq type="default">player-doc</packagereq>`
		`<packagereq type="default">player-examples</packagereq>`
		`<packagereq type="default">player-stage</packagereq>`
		`- <!-- FTI with Python 3.12:`
		`- https://bugzilla.redhat.com/show_bug.cgi?id=2220133`
		`- https://github.com/ros-infrastructure/bloom/issues/707`
		`<packagereq type="default">python3-bloom</packagereq>`
		`- !-->`
		`<packagereq type="default">python3-catkin_lint</packagereq>`
		`<packagereq type="default">python3-catkin_pkg</packagereq>`
		`<packagereq type="default">python3-catkin_tools</packagereq>`
		`<packagereq type="default">python3-colcon-common-extensions</packagereq>`
		`<packagereq type="default">python3-rosdep</packagereq>`
		`<packagereq type="default">python3-rosdistro</packagereq>`
		`+ <packagereq type="default">python3-rosinstall</packagereq>`
		`<packagereq type="default">python3-rosinstall_generator</packagereq>`
		`<packagereq type="default">python3-rospkg</packagereq>`
		`<packagereq type="default">python3-vcstool</packagereq>`
		`+ <packagereq type="default">python3-vcstools</packagereq>`
		`+ <packagereq type="default">python3-wstool</packagereq>`
		`<packagereq type="default">rcssmonitor</packagereq>`
		`<packagereq type="default">rcssserver</packagereq>`
		`<packagereq type="default">rcssserver-gui</packagereq>`
		`@@ -4777,6 +4814,7 @@`
		`<packagereq type="default">subnetcalc</packagereq>`
		`<packagereq type="default">swaks</packagereq>`
		`<packagereq type="default">sysstat</packagereq>`
		`+ <packagereq type="default">tcpcrypt</packagereq>`
		`<packagereq type="default">tcpdump</packagereq>`
		`<packagereq type="default">tcpflow</packagereq>`
		`<packagereq type="default">tcpick</packagereq>`
		`@@ -4998,7 +5036,6 @@`
		`<packagereq>acl</packagereq>`
		`<packagereq>at</packagereq>`
		`<packagereq>attr</packagereq>`
		`- <packagereq>bash-color-prompt</packagereq>`
		`<packagereq>bash-completion</packagereq>`
		`<packagereq>bc</packagereq>`
		`<packagereq>bind-utils</packagereq>`
		`@@ -5185,7 +5222,7 @@`
		`<packagereq type="default">plymouth-system-theme</packagereq>`
		`<packagereq type="default">pulseaudio-utils</packagereq>`
		`<packagereq type="default">sddm</packagereq>`
		`- <packagereq type="default">sddm-wayland-sway</packagereq>`
		`+ <packagereq type="default">sddm-x11</packagereq>`
		`<packagereq type="default">system-config-printer</packagereq>`
		`<packagereq type="default">Thunar</packagereq>`
		`<packagereq type="default">thunar-archive-plugin</packagereq>`
		`@@ -5559,7 +5596,7 @@`
		`<uservisible>false</uservisible>`
		`<packagelist>`
		`<packagereq type="mandatory">amd-gpu-firmware</packagereq>`
		`- <packagereq type="mandatory">dnf</packagereq>`
		`+ <packagereq type="mandatory">dnf5</packagereq>`
		`<packagereq type="mandatory">intel-gpu-firmware</packagereq>`
		`<packagereq type="mandatory">linux-firmware</packagereq>`
		`<packagereq arch="x86_64" type="mandatory">microcode_ctl</packagereq>`
		`@@ -5572,8 +5609,8 @@`
		`<packagereq type="default">abrt-desktop</packagereq>`
		`<packagereq type="default">abrt-java-connector</packagereq>`
		`<packagereq type="default">acl</packagereq>`
		`+ <packagereq type="default">adwaita-qt5</packagereq>`
		`<packagereq type="default">attr</packagereq>`
		`- <packagereq type="default">bash-color-prompt</packagereq>`
		`<packagereq type="default">bash-completion</packagereq>`
		`<packagereq type="default">bc</packagereq>`
		`<packagereq type="default">bind-utils</packagereq>`
		`@@ -5588,7 +5625,7 @@`
		`<packagereq type="default">default-editor</packagereq>`
		`<packagereq type="default">deltarpm</packagereq>`
		`<packagereq type="default">desktop-backgrounds-gnome</packagereq>`
		`- <packagereq type="default">dnf-plugins-core</packagereq>`
		`+ <packagereq type="default">dnf5-plugins</packagereq>`
		`<packagereq type="default">dos2unix</packagereq>`
		`<packagereq type="default">dosfstools</packagereq>`
		`<packagereq type="default">ethtool</packagereq>`
		`@@ -5644,7 +5681,7 @@`
		`<packagereq type="default">psacct</packagereq>`
		`<packagereq type="default">psmisc</packagereq>`
		`<packagereq type="default">python3-dnf-plugin-system-upgrade</packagereq>`
		`- <packagereq type="default">qadwaitadecorations-qt5</packagereq>`
		`+ <packagereq type="default">qgnomeplatform-qt5</packagereq>`
		`<packagereq type="default">qt5-qtbase</packagereq>`
		`<packagereq type="default">qt5-qtbase-gui</packagereq>`
		`<packagereq type="default">qt5-qtdeclarative</packagereq>`

comps-f40.xml.in

file modified

		`@@ -811,6 +811,7 @@`
		`<packagereq type="default">gnome-bluetooth</packagereq>`
		`<packagereq type="default">gnome-software</packagereq>`
		`<packagereq type="default">nautilus</packagereq>`
		`+ <packagereq type="default">toolbox</packagereq>`
		`</packagelist>`
		`</group>`
		`<group>`

sumantrom commented 8 months ago

serialized and add crit-path defs

sumantrom commented 8 months ago

@adamwill , I did as instructed. Thanks for the guidance :)

zuul commented 8 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/3cc98dacb4b44ab6adbbca47b0be179e

validate-comps : FAILURE in 4m 34s

adamwill commented 8 months ago

Ah, sorry, I may not have been specific enough. The entries in comps need to be alphabetical within each 'type'. Don't mix 'mandatory' and 'default' entries like this. In each group the 'mandatory' entries come first in alphabetical order, then the 'default' entries, then the 'optional' entries. You don't need to re-order anything else in your PR, just add 'toolbox' in the appropriate places.

sumantrom commented 8 months ago

Ah, sorry, I may not have been specific enough. The entries in comps need to be alphabetical within each 'type'. Don't mix 'mandatory' and 'default' entries like this. In each group the 'mandatory' entries come first in alphabetical order, then the 'default' entries, then the 'optional' entries. You don't need to re-order anything else in your PR, just add 'toolbox' in the appropriate places.

woah! I effed that up nicely :D .. lemme retry :)

1 new commit added