Skip to content

Commit 963356f

Browse files
committed
Revert "Merge branch 'main' into main"
This reverts commit 5c2df13, reversing changes made to 4387f9b.
1 parent 6730416 commit 963356f

File tree

85 files changed

+574
-8726
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+574
-8726
lines changed

board/explora/explora.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,3 @@ libWPEFrameworkInputSwitch.so
185185
playready
186186
MeteringCertificate.bin
187187
cobalt.json
188-
libpsl.so
189-
*.pem
190-
*.crt

board/raspberrypi/rpi23-linux-5.10.config

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ CONFIG_BRCMFMAC_USB=y
330330
# CONFIG_WLAN_VENDOR_QUANTENNA is not set
331331
CONFIG_INPUT_MOUSEDEV=y
332332
CONFIG_INPUT_JOYDEV=m
333-
CONFIG_INPUT_EVDEV=y
333+
CONFIG_INPUT_EVDEV=m
334334
# CONFIG_KEYBOARD_ATKBD is not set
335335
CONFIG_KEYBOARD_GPIO=m
336336
CONFIG_KEYBOARD_MATRIX=m
@@ -608,8 +608,7 @@ CONFIG_SND_SOC=y
608608
CONFIG_SND_BCM2835_SOC_I2S=y
609609
CONFIG_HID_BATTERY_STRENGTH=y
610610
CONFIG_HIDRAW=y
611-
CONFIG_HID_GENERIC=y
612-
CONFIG_USB_HID=y
611+
# CONFIG_HID_GENERIC is not set
613612
CONFIG_HID_PID=y
614613
CONFIG_USB_HIDDEV=y
615614
CONFIG_USB=y

docs/manual/adding-packages-cmake.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ typical packages will therefore only use a few of them.
100100
necessary to set them in the package's +*.mk+ file unless you want
101101
to override them:
102102

103-
** +CMAKE_BUILD_TYPE+ is driven by +BR2_ENABLE_RUNTIME_DEBUG+;
103+
** +CMAKE_BUILD_TYPE+ is driven by +BR2_ENABLE_DEBUG+;
104104
** +CMAKE_INSTALL_PREFIX+;
105105
** +BUILD_SHARED_LIBS+ is driven by +BR2_STATIC_LIBS+;
106106
** +BUILD_DOC+, +BUILD_DOCS+ are disabled;

docs/manual/adding-packages-meson.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,6 @@ will therefore only use a few of them.
116116
single quotes. By default, empty. Note that Buildroot already sets the
117117
correct values for +c+, +cpp+, +ar+, +strip+, and +pkgconfig+.
118118

119-
* +FOO_MESON_EXTRA_PROPERTIES+, to specify a space-separated list of
120-
properties to add to the `[properties]` section of the meson
121-
`cross-compilation.conf` configuration file. The format is
122-
`property-name=<value>` with no space around the +=+ sign, and with
123-
single quotes around string values. By default, empty. Note that
124-
Buildroot already sets values for +needs_exe_wrapper+, +c_args+,
125-
+c_link_args+, +cpp_args+, +cpp_link_args+, +sys_root+, and
126-
+pkg_config_libdir+.
127-
128119
* +FOO_NINJA_ENV+, to specify additional environment variables to pass to
129120
+ninja+, meson companion tool in charge of the build operations. By default,
130121
empty.

package/Config.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ menu "Target packages"
1212
menu "Audio and video applications"
1313
source "package/aamp/Config.in"
1414
source "package/aampabr/Config.in"
15-
source "package/aampmetrics/Config.in"
1615
source "package/alsa-utils/Config.in"
1716
source "package/atest/Config.in"
1817
source "package/amazon-alexa/Config.in"
@@ -344,8 +343,6 @@ comment "Graphic libraries"
344343
source "package/tk/Config.in"
345344

346345
comment "Other GUIs"
347-
source "package/spark/Config.in"
348-
source "package/pxcore-libnode/Config.in"
349346
source "package/qt5/Config.in"
350347
if BR2_PACKAGE_QT5
351348
comment "QT libraries and helper libraries"

package/aamp/0002-rdk-amp-align-ocdm-drm-adapter-interface.patch

Lines changed: 0 additions & 20 deletions
This file was deleted.

package/aampmetrics/Config.in

Lines changed: 0 additions & 5 deletions
This file was deleted.

package/aampmetrics/aampmetrics.mk

Lines changed: 0 additions & 13 deletions
This file was deleted.

package/cobalt/cobalt.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
COBALT_VERSION = 1ce72e8929579921868c9d87a0ba4128cc88d9e9
7+
COBALT_VERSION = e5c4fd2aec74ead45dac6c7f57527b9dd8e94267
88
COBALT_SITE_METHOD = git
99
COBALT_SITE = [email protected]:Metrological/cobalt
1010
COBALT_INSTALL_STAGING = YES

package/glib-networking/Config.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ config BR2_PACKAGE_GLIB_NETWORKING
66
depends on !BR2_STATIC_LIBS
77
select BR2_PACKAGE_LIBGLIB2
88
select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS
9-
select BR2_PACKAGE_P11_KIT if BR2_PACKAGE_GNUTLS
109
help
1110
Network-related GIO modules for glib.
1211

0 commit comments

Comments
 (0)