diff options
Diffstat (limited to 'meta-openembedded/meta-oe')
201 files changed, 3709 insertions, 923 deletions
diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index a964a99fb..9b3f28700 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -37,7 +37,7 @@ LAYERVERSION_openembedded-layer = "1" LAYERDEPENDS_openembedded-layer = "core" -LAYERSERIES_COMPAT_openembedded-layer = "gatesgarth" +LAYERSERIES_COMPAT_openembedded-layer = "gatesgarth hardknott" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/bacnet.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/bacnet.json new file mode 100644 index 000000000..e36a2165d --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/bacnet.json @@ -0,0 +1,58 @@ +{ + "general": { + "objectName": "TB_gateway", + "address": "192.168.188.181:1052", + "objectIdentifier": 599, + "maxApduLengthAccepted": 1024, + "segmentationSupported": "segmentedBoth", + "vendorIdentifier": 15 + }, + "devices": [ + { + "deviceName": "BACnet Device ${objectName}", + "deviceType": "default", + "address": "192.168.188.181:10520", + "pollPeriod": 10000, + "attributes": [ + { + "key": "temperature", + "type": "string", + "objectId": "analogOutput:1", + "propertyId": "presentValue" + } + ], + "timeseries": [ + { + "key": "state", + "type": "bool", + "objectId": "binaryValue:1", + "propertyId": "presentValue" + } + ], + "attributeUpdates": [ + { + "key": "brightness", + "requestType": "writeProperty", + "objectId": "analogOutput:1", + "propertyId": "presentValue" + } + ], + "serverSideRpc": [ + { + "method": "set_state", + "requestType": "writeProperty", + "requestTimeout": 10000, + "objectId": "binaryOutput:1", + "propertyId": "presentValue" + }, + { + "method": "get_state", + "requestType": "readProperty", + "requestTimeout": 10000, + "objectId": "binaryOutput:1", + "propertyId": "presentValue" + } + ] + } + ] + }
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/ble.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/ble.json new file mode 100755 index 000000000..2a5da3f41 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/ble.json @@ -0,0 +1,53 @@ +{ + "name": "BLE Connector", + "rescanIntervalSeconds": 100, + "checkIntervalSeconds": 100, + "scanTimeSeconds": 5, + "passiveScanMode": true, + "devices": [ + { + "name": "Temperature and humidity sensor", + "MACAddress": "4C:65:A8:DF:85:C0", + "addrType": "public", + "telemetry": [ + { + "key": "temperature", + "method": "notify", + "characteristicUUID": "226CAA55-6476-4566-7562-66734470666D", + "byteFrom": 2, + "byteTo": 6 + }, + { + "key": "humidity", + "method": "notify", + "characteristicUUID": "226CAA55-6476-4566-7562-66734470666D", + "byteFrom": 9, + "byteTo": 13 + } + ], + "attributes": [ + { + "key": "name", + "characteristicUUID": "00002A00-0000-1000-8000-00805F9B34FB", + "method": "read", + "byteFrom": 0, + "byteTo": -1 + } + ], + "attributeUpdates": [ + { + "attributeOnThingsBoard": "sharedName", + "characteristicUUID": "00002A00-0000-1000-8000-00805F9B34FB" + } + ], + "serverSideRpc": [ + { + "methodRPC": "rpcMethod1", + "withResponse": true, + "characteristicUUID": "00002A00-0000-1000-8000-00805F9B34FB", + "methodProcessing": "read" + } + ] + } + ] +}
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/can.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/can.json new file mode 100644 index 000000000..b5cec0045 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/can.json @@ -0,0 +1,89 @@ +{ + "interface": "socketcan", + "channel": "vcan0", + "backend": { + "fd": true + }, + "reconnectPeriod": 5, + "devices": [ + { + "name": "Car", + "sendDataOnlyOnChange": false, + "enableUnknownRpc": true, + "strictEval": false, + "attributes": [ + { + "key": "isDriverDoorOpened", + "nodeId": 41, + "command": "2:2:big:8717", + "value": "4:1:int", + "expression": "bool(value & 0b00000100)", + "polling": { + "type": "once", + "dataInHex": "AB CD AB CD" + } + } + ], + "timeseries": [ + { + "key": "rpm", + "nodeId": 1918, + "isExtendedId": true, + "command": "2:2:big:48059", + "value": "4:2:big:int", + "expression": "value / 4", + "polling": { + "type": "always", + "period": 5, + "dataInHex": "aaaa bbbb aaaa bbbb" + } + }, + { + "key": "milliage", + "nodeId": 1918, + "isExtendedId": true, + "value": "4:2:little:int", + "expression": "value * 10", + "polling": { + "type": "always", + "period": 30, + "dataInHex": "aa bb cc dd ee ff aa bb" + } + } + ], + "attributeUpdates": [ + { + "attributeOnThingsBoard": "softwareVersion", + "nodeId": 64, + "isExtendedId": true, + "dataLength": 4, + "dataExpression": "value + 5", + "dataByteorder": "little" + } + ], + "serverSideRpc": [ + { + "method": "sendSameData", + "nodeId": 4, + "isExtendedId": true, + "isFd": true, + "bitrateSwitch": true, + "dataInHex": "aa bb cc dd ee ff aa bb aa bb cc d ee ff" + }, + { + "method": "setLightLevel", + "nodeId": 5, + "dataLength": 2, + "dataByteorder": "little", + "dataBefore": "00AA" + }, + { + "method": "setSpeed", + "nodeId": 16, + "dataAfter": "0102", + "dataExpression": "userSpeed if maxAllowedSpeed > userSpeed else maxAllowedSpeed" + } + ] + } + ] + }
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/custom_serial.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/custom_serial.json new file mode 100755 index 000000000..0aee5cb76 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/custom_serial.json @@ -0,0 +1,33 @@ +{ + "name": "Custom serial connector", + "devices": [ + { + "name": "CustomSerialDevice1", + "type": "default", + "port": "/dev/ttyUSB0", + "baudrate": 9600, + "converter": "CustomSerialUplinkConverter", + "telemetry": [ + { + "type": "byte", + "key": "humidity", + "untilDelimiter": "\r" + } + ], + "attributes":[ + { + "key": "SerialNumber", + "type": "string", + "fromByte": 4, + "toByte": -1 + } + ], + "attributeUpdates": [ + { + "attributeOnThingsBoard": "attr1", + "stringToDevice": "value = ${attr1}\n" + } + ] + } + ] +}
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/logs.conf b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/logs.conf new file mode 100755 index 000000000..d66c2b84a --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/logs.conf @@ -0,0 +1,77 @@ +[loggers] +keys=root, service, connector, converter, tb_connection, storage, extension +[handlers] +keys=consoleHandler, serviceHandler, connectorHandler, converterHandler, tb_connectionHandler, storageHandler, extensionHandler +[formatters] +keys=LogFormatter +[logger_root] +level=ERROR +handlers=consoleHandler +[logger_connector] +level=INFO +handlers=connectorHandler +formatter=LogFormatter +qualname=connector +[logger_storage] +level=INFO +handlers=storageHandler +formatter=LogFormatter +qualname=storage +[logger_tb_connection] +level=INFO +handlers=tb_connectionHandler +formatter=LogFormatter +qualname=tb_connection +[logger_service] +level=INFO +handlers=serviceHandler +formatter=LogFormatter +qualname=service +[logger_converter] +level=INFO +handlers=converterHandler +formatter=LogFormatter +qualname=converter +[logger_extension] +level=INFO +handlers=connectorHandler +formatter=LogFormatter +qualname=extension +[handler_consoleHandler] +class=StreamHandler +level=INFO +formatter=LogFormatter +args=(sys.stdout,) +[handler_connectorHandler] +level=INFO +class=logging.handlers.TimedRotatingFileHandler +formatter=LogFormatter +args=("./logs/connector.log", "d", 1, 7,) +[handler_storageHandler] +level=INFO +class=logging.handlers.TimedRotatingFileHandler +formatter=LogFormatter +args=("./logs/storage.log", "d", 1, 7,) +[handler_serviceHandler] +level=INFO +class=logging.handlers.TimedRotatingFileHandler +formatter=LogFormatter +args=("./logs/service.log", "d", 1, 7,) +[handler_converterHandler] +level=INFO +class=logging.handlers.TimedRotatingFileHandler +formatter=LogFormatter +args=("./logs/converter.log", "d", 1, 3,) +[handler_extensionHandler] +level=INFO +class=logging.handlers.TimedRotatingFileHandler +formatter=LogFormatter +args=("./logs/extension.log", "d", 1, 3,) +[handler_tb_connectionHandler] +level=INFO +class=logging.handlers.TimedRotatingFileHandler +formatter=LogFormatter +args=("./logs/tb_connection.log", "d", 1, 3,) +[formatter_LogFormatter] +format="%(asctime)s - %(levelname)s - [%(filename)s] - %(module)s - %(lineno)d - %(message)s" +datefmt="%Y-%m-%d %H:%M:%S"
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus.json new file mode 100755 index 000000000..479d8aa4d --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus.json @@ -0,0 +1,169 @@ +{ + "server": { + "type": "tcp", + "host": "127.0.0.1", + "port": 5020, + "timeout": 35, + "method": "socket", + "byteOrder": "BIG", + "devices": [ + { + "unitId": 1, + "deviceName": "Temp Sensor", + "attributesPollPeriod": 5000, + "timeseriesPollPeriod": 5000, + "sendDataOnlyOnChange": true, + "attributes": [ + { + "tag": "string_read", + "type": "string", + "functionCode": 4, + "objectsCount": 4, + "address": 1 + }, + { + "tag": "bits_read", + "type": "bits", + "functionCode": 4, + "objectsCount": 1, + "address": 5 + }, + { + "tag": "8int_read", + "type": "8int", + "functionCode": 4, + "objectsCount": 1, + "address": 6 + }, + { + "tag": "16int_read", + "type": "16int", + "functionCode": 4, + "objectsCount": 1, + "address": 7 + }, + { + "tag": "32int_read_divider", + "type": "32int", + "functionCode": 4, + "objectsCount": 2, + "address": 8, + "divider": 10 + }, + { + "tag": "8int_read_multiplier", + "type": "8int", + "functionCode": 4, + "objectsCount": 1, + "address": 10, + "multiplier": 10 + }, + { + "tag": "32int_read", + "type": "32int", + "functionCode": 4, + "objectsCount": 2, + "address": 11 + }, + { + "tag": "64int_read", + "type": "64int", + "functionCode": 4, + "objectsCount": 4, + "address": 13 + } + ], + "timeseries": [ + { + "tag": "8uint_read", + "type": "8uint", + "functionCode": 4, + "objectsCount": 1, + "address": 17 + }, + { + "tag": "16uint_read", + "type": "16uint", + "functionCode": 4, + "objectsCount": 2, + "address": 18 + }, + { + "tag": "32uint_read", + "type": "32uint", + "functionCode": 4, + "objectsCount": 4, + "address": 20 + }, + { + "tag": "64uint_read", + "type": "64uint", + "functionCode": 4, + "objectsCount": 1, + "address": 24 + }, + { + "tag": "16float_read", + "type": "16float", + "functionCode": 4, + "objectsCount": 1, + "address": 25 + }, + { + "tag": "32float_read", + "type": "32float", + "functionCode": 4, + "objectsCount": 2, + "address": 26 + }, + { + "tag": "64float_read", + "type": "64float", + "functionCode": 4, + "objectsCount": 4, + "address": 28 + } + ], + "attributeUpdates": [ + { + "tag": "shared_attribute_write", + "type": "32int", + "functionCode": 6, + "objectsCount": 2, + "address": 29 + } + ], + "rpc": [ + { + "tag": "setValue", + "type": "bits", + "functionCode": 5, + "objectsCount": 1, + "address": 31 + }, + { + "tag": "getValue", + "type": "bits", + "functionCode": 1, + "objectsCount": 1, + "address": 31 + }, + { + "tag": "setCPUFanSpeed", + "type": "32int", + "functionCode": 16, + "objectsCount": 2, + "address": 33 + }, + { + "tag":"getCPULoad", + "type": "32int", + "functionCode": 4, + "objectsCount": 2, + "address": 35 + } + ] + } + ] + } +} diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus_serial.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus_serial.json new file mode 100755 index 000000000..19b38e3f7 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus_serial.json @@ -0,0 +1,29 @@ +{ + "server": { + "name": "Modbus Default Server", + "type": "serial", + "method": "rtu", + "port": "/dev/ttyUSB0", + "baudrate": 19200, + "timeout": 35, + "devices": [ + { + "unitId": 1, + "deviceName": "Temp Sensor", + "attributesPollPeriod": 5000, + "timeseriesPollPeriod": 5000, + "sendDataOnlyOnChange": true, + "attributes": [ + { + "byteOrder": "BIG", + "tag": "test", + "type": "long", + "functionCode": 4, + "registerCount": 1, + "address": 4 + } + ] + } + ] + } +}
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/mqtt.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/mqtt.json new file mode 100755 index 000000000..6b78a7cec --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/mqtt.json @@ -0,0 +1,132 @@ +{ + "broker": { + "name":"Default Local Broker", + "host":"127.0.0.1", + "port":1883, + "clientId": "ThingsBoard_gateway", + "security": { + "type": "basic", + "username": "user", + "password": "password" + } + }, + "mapping": [ + { + "topicFilter": "/sensor/data", + "converter": { + "type": "json", + "deviceNameJsonExpression": "${serialNumber}", + "deviceTypeJsonExpression": "${sensorType}", + "timeout": 60000, + "attributes": [ + { + "type": "string", + "key": "model", + "value": "${sensorModel}" + }, + { + "type": "string", + "key": "${sensorModel}", + "value": "on" + } + ], + "timeseries": [ + { + "type": "double", + "key": "temperature", + "value": "${temp}" + }, + { + "type": "double", + "key": "humidity", + "value": "${hum}" + } + ] + } + }, + { + "topicFilter": "/sensor/+/data", + "converter": { + "type": "json", + "deviceNameTopicExpression": "(?<=sensor\/)(.*?)(?=\/data)", + "deviceTypeTopicExpression": "Thermometer", + "timeout": 60000, + "attributes": [ + { + "type": "string", + "key": "model", + "value": "${sensorModel}" + } + ], + "timeseries": [ + { + "type": "double", + "key": "temperature", + "value": "${temp}" + }, + { + "type": "double", + "key": "humidity", + "value": "${hum}" + } + ] + } + }, + { + "topicFilter": "/custom/sensors/+", + "converter": { + "type": "custom", + "extension": "CustomMqttUplinkConverter", + "extension-config": { + "temperatureBytes" : 2, + "humidityBytes" : 2, + "batteryLevelBytes" : 1 + } + } + } + ], + "connectRequests": [ + { + "topicFilter": "sensor/connect", + "deviceNameJsonExpression": "${SerialNumber}" + }, + { + "topicFilter": "sensor/+/connect", + "deviceNameTopicExpression": "(?<=sensor\/)(.*?)(?=\/connect)" + } + ], + "disconnectRequests": [ + { + "topicFilter": "sensor/disconnect", + "deviceNameJsonExpression": "${SerialNumber}" + }, + { + "topicFilter": "sensor/+/disconnect", + "deviceNameTopicExpression": "(?<=sensor\/)(.*?)(?=\/disconnect)" + } + ], + "attributeUpdates": [ + { + "deviceNameFilter": "SmartMeter.*", + "attributeFilter": "uploadFrequency", + "topicExpression": "sensor/${deviceName}/${attributeKey}", + "valueExpression": "{\"${attributeKey}\":\"${attributeValue}\"}" + } + ], + "serverSideRpc": [ + { + "deviceNameFilter": ".*", + "methodFilter": "echo", + "requestTopicExpression": "sensor/${deviceName}/request/${methodName}/${requestId}", + "responseTopicExpression": "sensor/${deviceName}/response/${methodName}/${requestId}", + "responseTimeout": 10000, + "valueExpression": "${params}" + }, + { + "deviceNameFilter": ".*", + "methodFilter": "no-reply", + "requestTopicExpression": "sensor/${deviceName}/request/${methodName}/${requestId}", + "valueExpression": "${params}" + } + ] +}
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/odbc.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/odbc.json new file mode 100644 index 000000000..c93992a26 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/odbc.json @@ -0,0 +1,54 @@ +{ + "connection": { + "str": "Driver={PostgreSQL};Server=localhost;Port=5432;Database=thingsboard;Uid=postgres;Pwd=postgres;", + "attributes": { + "autocommit": true, + "timeout": 0 + }, + "encoding": "utf-8", + "decoding": { + "char": "utf-8", + "wchar": "utf-8", + "metadata": "utf-16le" + }, + "reconnect": true, + "reconnectPeriod": 60 + }, + "pyodbc": { + "pooling": false + }, + "polling": { + "query": "SELECT bool_v, str_v, dbl_v, long_v, entity_id, ts FROM ts_kv WHERE ts > ? ORDER BY ts ASC LIMIT 10", + "period": 10, + "iterator": { + "column": "ts", + "query": "SELECT MIN(ts) - 1 FROM ts_kv", + "persistent": false + } + }, + "mapping": { + "device": { + "type": "postgres", + "name": "'ODBC ' + entity_id" + }, + "sendDataOnlyOnChange": false, + "attributes": "*", + "timeseries": [ + { + "name": "value", + "value": "[i for i in [str_v, long_v, dbl_v,bool_v] if i is not None][0]" + } + ] + }, + "serverSideRpc": { + "enableUnknownRpc": false, + "overrideRpcConfig": true, + "methods": [ + "procedureOne", + { + "name": "procedureTwo", + "args": [ "One", 2, 3.0 ] + } + ] + } + }
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/opcua.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/opcua.json new file mode 100755 index 000000000..1deed7d52 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/opcua.json @@ -0,0 +1,49 @@ +{ + "server": { + "name": "OPC-UA Default Server", + "url": "localhost:4840/freeopcua/server/", + "timeoutInMillis": 5000, + "scanPeriodInMillis": 5000, + "disableSubscriptions":false, + "subCheckPeriodInMillis": 100, + "showMap": false, + "security": "Basic128Rsa15", + "identity": { + "type": "anonymous" + }, + "mapping": [ + { + "deviceNodePattern": "Root\\.Objects\\.Device1", + "deviceNamePattern": "Device ${Root\\.Objects\\.Device1\\.serialNumber}", + "attributes": [ + { + "key": "temperature °C", + "path": "${ns=2;i=5}" + } + ], + "timeseries": [ + { + "key": "humidity", + "path": "${Root\\.Objects\\.Device1\\.TemperatureAndHumiditySensor\\.Humidity}" + }, + { + "key": "batteryLevel", + "path": "${Battery\\.batteryLevel}" + } + ], + "rpc_methods": [ + { + "method": "multiply", + "arguments": [2, 4] + } + ], + "attributes_updates": [ + { + "attributeOnThingsBoard": "deviceName", + "attributeOnDevice": "Root\\.Objects\\.Device1\\.serialNumber" + } + ] + } + ] + } +}
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/request.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/request.json new file mode 100644 index 000000000..43237a7dc --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/request.json @@ -0,0 +1,146 @@ +"job": "leader" +}, +"allowRedirects": true, +"timeout": 0.5, +"scanPeriod": 5, +"converter": { + "type": "json", + "deviceNameJsonExpression": "SD8500", + "deviceTypeJsonExpression": "SD", + "attributes": [ + { + "key": "serialNumber", + "type": "string", + "value": "${serial}" + } + ], + "telemetry": [ + { + "key": "Maintainer", + "type": "string", + "value": "${Developer}" + } + ] +} +}, +{ +"url": "get_info", +"httpMethod": "GET", +"httpHeaders": { + "ACCEPT": "application/json" +}, +"allowRedirects": true, +"timeout": 0.5, +"scanPeriod": 100, +"converter": { + "type": "custom", + "deviceNameJsonExpression": "SD8500", + "deviceTypeJsonExpression": "SD", + "extension": "CustomRequestUplinkConverter", + "extension-config": [ + { + "key": "Totaliser", + "type": "float", + "fromByte": 0, + "toByte": 4, + "byteorder": "big", + "signed": true, + "multiplier": 1 + }, + { + "key": "Flow", + "type": "int", + "fromByte": 4, + "toByte": 6, + "byteorder": "big", + "signed": true, + "multiplier": 0.01 + }, + { + "key": "Temperature", + "type": "int", + "fromByte": 8, + "toByte": 10, + "byteorder": "big", + "signed": true, + "multiplier": 0.01 + }, + { + "key": "Pressure", + "type": "int", + "fromByte": 12, + "toByte": 14, + "byteorder": "big", + "signed": true, + "multiplier": 0.01 + }, + { + "key": "deviceStatus", + "type": "int", + "byteAddress": 15, + "fromBit": 4, + "toBit": 8, + "byteorder": "big", + "signed": false + }, + { + "key": "OUT2", + "type": "int", + "byteAddress": 15, + "fromBit": 1, + "toBit": 2, + "byteorder": "big" + }, + { + "key": "OUT1", + "type": "int", + "byteAddress": 15, + "fromBit": 0, + "toBit": 1, + "byteorder": "big" + } + ] +} +} +], +"attributeUpdates": [ +{ + "httpMethod": "POST", + "httpHeaders": { + "CONTENT-TYPE": "application/json" + }, + "timeout": 0.5, + "tries": 3, + "allowRedirects": true, + "deviceNameFilter": "SD.*", + "attributeFilter": "send_data", + "requestUrlExpression": "sensor/${deviceName}/${attributeKey}", + "valueExpression": "{\"${attributeKey}\":\"${attributeValue}\"}" +} +], +"serverSideRpc": [ +{ +"deviceNameFilter": ".*", +"methodFilter": "echo", +"requestUrlExpression": "sensor/${deviceName}/request/${methodName}/${requestId}", +"responseTimeout": 1, +"httpMethod": "GET", +"valueExpression": "${params}", +"timeout": 0.5, +"tries": 3, +"httpHeaders": { + "Content-Type": "application/json" +} +}, +{ +"deviceNameFilter": ".*", +"methodFilter": "no-reply", +"requestUrlExpression": "sensor/${deviceName}/request/${methodName}/${requestId}", +"httpMethod": "POST", +"valueExpression": "${params}", +"httpHeaders": { + "Content-Type": "application/json" +} +} +] +}
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/rest.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/rest.json new file mode 100644 index 000000000..be6c6ff18 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/rest.json @@ -0,0 +1,152 @@ +{ + "host": "127.0.0.1", + "port": "5000", + "mapping":[ + { + "endpoint": "/device1", + "HTTPMethods": [ + "POST" + ], + "security": + { + "type": "basic", + "username": "user", + "password": "passwd" + }, + "converter": { + "type": "json", + "deviceNameExpression": "Device ${name}", + "deviceTypeExpression": "default", + "attributes": [ + { + "type": "string", + "key": "model", + "value": "${sensorModel}" + } + ], + "timeseries": [ + { + "type": "double", + "key": "${sensorModel}", + "value": "${temp}" + }, + { + "type": "double", + "key": "humidity", + "value": "${hum}" + } + ] + } + }, + { + "endpoint": "/anon1", + "HTTPMethods": [ + "GET", + "POST" + ], + "security": + { + "type": "anonymous" + }, + "converter": { + "type": "json", + "deviceNameExpression": "Device 2", + "deviceTypeExpression": "default", + "attributes": [ + { + "type": "string", + "key": "model", + "value": "Model2" + } + ], + "timeseries": [ + { + "type": "double", + "key": "temperature", + "value": "${temp}" + }, + { + "type": "double", + "key": "humidity", + "value": "${hum}" + } + ] + } + }, + { + "endpoint": "/anon2", + "HTTPMethods": [ + "POST" + ], + "security": + { + "type": "anonymous" + }, + "converter": { + "type": "custom", + "deviceNameExpression": "SuperAnonDevice", + "deviceTypeExpression": "default", + "extension": "CustomRestUplinkConverter", + "extension-config": [ + { + "key": "Totaliser", + "datatype": "float", + "fromByte": 0, + "toByte": 4, + "byteorder": "big", + "signed": true, + "multiplier": 1 + }] + } + } + ], + "attributeUpdates": [ + { + "HTTPMethod": "POST", + "SSLVerify": false, + "httpHeaders": { + "CONTENT-TYPE": "application/json" + }, + "security": { + "type": "basic", + "username": "user", + "password": "passwd" + }, + "timeout": 0.5, + "tries": 3, + "allowRedirects": true, + "deviceNameFilter": ".*REST$", + "attributeFilter": "data", + "requestUrlExpression": "sensor/${deviceName}/${attributeKey}", + "valueExpression": "{\"${attributeKey}\":\"${attributeValue}\"}" + } + ], + "serverSideRpc": [ + { + "deviceNameFilter": ".*", + "methodFilter": "echo", + "requestUrlExpression": "http://127.0.0.1:5001/${deviceName}", + "responseTimeout": 1, + "HTTPMethod": "GET", + "valueExpression": "${params}", + "timeout": 0.5, + "tries": 3, + "httpHeaders": { + "Content-Type": "application/json" + }, + "security": { + "type": "anonymous" + } + }, + { + "deviceNameFilter": ".*", + "methodFilter": "no-reply", + "requestUrlExpression": "sensor/${deviceName}/request/${methodName}/${requestId}", + "HTTPMethod": "POST", + "valueExpression": "${params}", + "httpHeaders": { + "Content-Type": "application/json" + } + } + ] + }
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/snmp.json b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/snmp.json new file mode 100644 index 000000000..b4ddb4264 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/snmp.json @@ -0,0 +1,138 @@ +{ + "devices": [ + { + "deviceName": "SNMP router", + "deviceType": "snmp", + "ip": "snmp.live.gambitcommunications.com", + "port": 161, + "pollPeriod": 5000, + "community": "public", + "attributes": [ + { + "key": "ReceivedFromGet", + "method": "get", + "oid": "1.3.6.1.2.1.1.1.0", + "timeout": 6 + }, + { + "key": "ReceivedFromMultiGet", + "method": "multiget", + "oid": [ + "1.3.6.1.2.1.1.1.0", + "1.3.6.1.2.1.1.2.0" + ], + "timeout": 6 + }, + { + "key": "ReceivedFromGetNext", + "method": "getnext", + "oid": "1.3.6.1.2.1.1.1.0", + "timeout": 6 + }, + { + "key": "ReceivedFromMultiWalk", + "method": "multiwalk", + "oid": [ + "1.3.6.1.2.1.1.1.0", + "1.3.6.0.1.2.1" + ] + }, + { + "key": "ReceivedFromBulkWalk", + "method": "bulkwalk", + "oid": [ + "1.3.6.1.2.1.1.1.0", + "1.3.6.1.2.1.1.2.0" + ] + }, + { + "key": "ReceivedFromBulkGet", + "method": "bulkget", + "scalarOid": [ + "1.3.6.1.2.1.1.1.0", + "1.3.6.1.2.1.1.2.0" + ], + "repeatingOid": [ + "1.3.6.1.2.1.1.1.0", + "1.3.6.1.2.1.1.2.0" + ], + "maxListSize": 10 + } + ], + "telemetry": [ + { + "key": "ReceivedFromWalk", + "community": "private", + "method": "walk", + "oid": "1.3.6.1.2.1.1.1.0" + }, + { + "key": "ReceivedFromTable", + "method": "table", + "oid": "1.3.6.1.2.1.1" + } + ], + "attributeUpdateRequests": [ + { + "attributeFilter": "dataToSet", + "method": "set", + "oid": "1.3.6.1.2.1.1.1.0" + }, + { + "attributeFilter": "dataToMultiSet", + "method": "multiset", + "mappings": { + "1.2.3": "10", + "2.3.4": "${attribute}" + } + } + ], + "serverSideRpcRequests": [ + { + "requestFilter": "setData", + "method": "set", + "oid": "1.3.6.1.2.1.1.1.0" + }, + { + "requestFilter": "multiSetData", + "method": "multiset" + }, + { + "requestFilter": "getData", + "method": "get", + "oid": "1.3.6.1.2.1.1.1.0" + }, + { + "requestFilter": "runBulkWalk", + "method": "bulkwalk", + "oid": [ + "1.3.6.1.2.1.1.1.0", + "1.3.6.1.2.1.1.2.0" + ] + } + ] + }, + { + "deviceName": "SNMP router", + "deviceType": "snmp", + "ip": "127.0.0.1", + "pollPeriod": 5000, + "community": "public", + "converter": "CustomSNMPConverter", + "attributes": [ + { + "key": "ReceivedFromGetWithCustomConverter", + "method": "get", + "oid": "1.3.6.1.2.1.1.1.0" + } + ], + "telemetry": [ + { + "key": "ReceivedFromTableWithCustomConverter", + "method": "table", + "oid": "1.3.6.1.2.1.1.1.0" + } + ] + } + ] + }
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/tb_gateway.yaml b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/tb_gateway.yaml new file mode 100755 index 000000000..e3eb8f1fc --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/tb_gateway.yaml @@ -0,0 +1,66 @@ +thingsboard: + host: demo.thingsboard.io + port: 1883 + remoteConfiguration: false + security: + accessToken: PUT_YOUR_GW_ACCESS_TOKEN_HERE +storage: + type: memory + read_records_count: 100 + max_records_count: 100000 +# type: file +# data_folder_path: ./data/ +# max_file_count: 10 +# max_read_records_count: 10 +# max_records_per_file: 10000 +connectors: + - + name: MQTT Broker Connector + type: mqtt + configuration: mqtt.json + +# - +# name: Modbus Connector +# type: modbus +# configuration: modbus.json +# +# - +# name: Modbus Connector +# type: modbus +# configuration: modbus_serial.json +# +# - +# name: OPC-UA Connector +# type: opcua +# configuration: opcua.json +# +# - +# name: BLE Connector +# type: ble +# configuration: ble.json +# +# - +# name: REQUEST Connector +# type: request +# configuration: request.json +# +# - +# name: CAN Connector +# type: can +# configuration: can.json +# +# - +# name: BACnet Connector +# type: bacnet +# configuration: bacnet.json +# +# - +# name: ODBC Connector +# type: odbc +# configuration: odbc.json +# +# - +# name: Custom Serial Connector +# type: serial +# configuration: custom_serial.json +# class: CustomSerialConnector diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/thingsboard-gateway.service b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/thingsboard-gateway.service new file mode 100644 index 000000000..5dd352a55 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/thingsboard-gateway.service @@ -0,0 +1,13 @@ +[Unit] +Description = Systemd service for Thingsboard Gateway +After = network.target + +[Service] +ExecStart = /usr/bin/python3 /usr/bin/thingsboard-gateway +ExecStop = /bin/kill -INT $MAINPID +ExecReload = /bin/kill -TERM $MAINPID +Restart = always +Type = simple + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.5.2.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.5.2.bb new file mode 100644 index 000000000..2f0ef16c8 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.5.2.bb @@ -0,0 +1,68 @@ +SUMMARY = "Open-source IoT platform for data collection, processing, visualization, and device management" +DESCRIPTION = "\ +The Thingsboard IoT Gateway is an open-source solution that allows you \ +to integrate devices connected to legacy and third-party systems with Thingsboard." +HOMEPAGE = "https://thingsboard.io/" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +SRC_URI[md5sum] = "469c8b5cd1c16c20ef40f0a97a3a0fda" +SRC_URI[sha256sum] = "b328f4e315c3541ac80a4931974a34a81afe4d1f382f48e8604669a55816c0d7" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "thingsboard-gateway" + +RDEPENDS_${PN} += " python3-jsonpath-rw \ + python3-regex \ + python3-paho-mqtt \ + python3-pyyaml \ + python3-simplejson \ + python3-requests \ + python3-pip \ + python3-pyrsistent \ +" + +SRC_URI += "file://bacnet.json \ + file://ble.json \ + file://can.json \ + file://custom_serial.json \ + file://modbus.json \ + file://modbus_serial.json \ + file://mqtt.json \ + file://opcua.json \ + file://odbc.json \ + file://request.json \ + file://rest.json \ + file://snmp.json \ + file://tb_gateway.yaml \ + file://logs.conf \ + file://thingsboard-gateway.service \ + " + + +inherit systemd + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "thingsboard-gateway.service" + +FILES_${PN} += "/etc \ + /lib \ + /usr \ +" + +do_install_append(){ + + install -d ${D}${sysconfdir}/thingsboard-gateway/config + + for file in $(find ${WORKDIR} -maxdepth 1 -type f -name *.json); do + install -m 0644 "$file" ${D}${sysconfdir}/thingsboard-gateway/config + done + + install -m 0644 ${WORKDIR}/tb_gateway.yaml ${D}${sysconfdir}/thingsboard-gateway/config + install -m 0644 ${WORKDIR}/logs.conf ${D}${sysconfdir}/thingsboard-gateway/config + + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/thingsboard-gateway.service ${D}${systemd_system_unitdir}/thingsboard-gateway.service +}
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.4.bb index 2e3da7d4d..19db89bdc 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.4.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f" DEPENDS = "protobuf-native" SRC_URI = "git://github.com/nanopb/nanopb.git" -SRCREV = "70f0de9877b1ce12abc0229d5df84db6349fcbfc" +SRCREV = "2b48a361786dfb1f63d229840217a93aae064667" S = "${WORKDIR}/git" @@ -27,4 +27,3 @@ RDEPENDS_${PN} += "\ BBCLASSEXTEND = "native nativesdk" -PNBLACKLIST[nanopb] ?= "Needs forward porting to use python3" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.22.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.24.bb index b50ed9f27..1a42fd45c 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.22.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.24.bb @@ -22,7 +22,7 @@ PACKAGECONFIG_NUMA_armeb = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -SRCREV = "477b6753ad068983d49fea0abc91fab82da9bad0" +SRCREV = "45d3aa1f57be23db180f8db3d133e8094370f35c" SRC_URI = "git://git.kernel.dk/fio.git \ " diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch new file mode 100644 index 000000000..e9b880c26 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch @@ -0,0 +1,125 @@ +From 56e4959f0bc3e442c813d78e8ab6b3bf64b4ac66 Mon Sep 17 00:00:00 2001 +From: OpenEmbedded <oe.patch@oe> +Date: Wed, 2 Dec 2020 20:27:42 +0000 +Subject: [PATCH] fix dispmanx build + +For when the user is building "--with-flavors dispmanx-glesv2", fixes a bunch +of "redeclared as different kind of symbol" problems. + +This patch is almost entirely from: + https://github.com/glmark2/glmark2/commit/3b1a0f78d03ae126b78ee52a7c434809115e5993 + +Which was created by: Alexandros Frantzis <alexandros.frantzis@collabora.com> + +See: + https://github.com/glmark2/glmark2/issues/80 + +My contribution is to tweak the wscript to link all the required libraries. + +Upstream-status: submitted [https://github.com/glmark2/glmark2/pull/135] +Signed-off-by: Trevor Woerner <twoerner@gmail.com> +--- + src/native-state-dispmanx.cpp | 22 +++++++++++++++++----- + src/native-state-dispmanx.h | 7 +++---- + wscript | 2 +- + 3 files changed, 21 insertions(+), 10 deletions(-) + +diff --git a/src/native-state-dispmanx.cpp b/src/native-state-dispmanx.cpp +index 2117386..49f74e7 100644 +--- a/src/native-state-dispmanx.cpp ++++ b/src/native-state-dispmanx.cpp +@@ -23,13 +23,25 @@ + #include "native-state-dispmanx.h" + #include "log.h" + ++#include "EGL/egl.h" ++ + #include <cstring> + #include <csignal> + ++struct NativeStateDispmanx::Private ++{ ++ Private() ++ { ++ memset(&egl_dispmanx_window, 0, sizeof(egl_dispmanx_window)); ++ } ++ ++ EGL_DISPMANX_WINDOW_T egl_dispmanx_window; ++}; ++ + NativeStateDispmanx::NativeStateDispmanx() ++ : priv{std::make_unique<Private>()} + { + memset(&properties_, 0, sizeof(properties_)); +- memset(&egl_dispmanx_window, 0, sizeof(egl_dispmanx_window)); + } + + NativeStateDispmanx::~NativeStateDispmanx() +@@ -99,9 +111,9 @@ NativeStateDispmanx::create_window(WindowProperties const& properties) + 0 /*clamp*/, + DISPMANX_NO_ROTATE); + +- egl_dispmanx_window.element = dispmanx_element; +- egl_dispmanx_window.width = dst_rect.width; +- egl_dispmanx_window.height = dst_rect.height; ++ priv->egl_dispmanx_window.element = dispmanx_element; ++ priv->egl_dispmanx_window.width = dst_rect.width; ++ priv->egl_dispmanx_window.height = dst_rect.height; + vc_dispmanx_update_submit_sync(dispmanx_update); + + return true; +@@ -111,7 +123,7 @@ void* + NativeStateDispmanx::window(WindowProperties &properties) + { + properties = properties_; +- return &egl_dispmanx_window; ++ return &priv->egl_dispmanx_window; + } + + void +diff --git a/src/native-state-dispmanx.h b/src/native-state-dispmanx.h +index a6ed3d4..794b2d3 100644 +--- a/src/native-state-dispmanx.h ++++ b/src/native-state-dispmanx.h +@@ -24,10 +24,8 @@ + #define GLMARK2_NATIVE_STATE_DISPMANX_H_ + + #include <vector> ++#include <memory> + #include "bcm_host.h" +-#include "GLES/gl.h" +-#include "EGL/egl.h" +-#include "EGL/eglext.h" + + #include "native-state.h" + +@@ -46,11 +44,12 @@ public: + void flip(); + + private: ++ struct Private; + DISPMANX_DISPLAY_HANDLE_T dispmanx_display; + DISPMANX_UPDATE_HANDLE_T dispmanx_update; + DISPMANX_ELEMENT_HANDLE_T dispmanx_element; +- EGL_DISPMANX_WINDOW_T egl_dispmanx_window; + WindowProperties properties_; ++ std::unique_ptr<Private> priv; + }; + + #endif /* GLMARK2_NATIVE_STATE_DISPMANX_H_ */ +diff --git a/wscript b/wscript +index e09fa78..6c3869c 100644 +--- a/wscript ++++ b/wscript +@@ -205,7 +205,7 @@ def configure_linux(ctx): + + ctx.check_cxx(lib = 'brcmGLESv2', uselib_store = 'glesv2', libpath='/opt/vc/lib') + ctx.check_cxx(lib = ['brcmEGL', 'brcmGLESv2'], uselib_store = 'egl', libpath='/opt/vc/lib') +- ctx.check_cxx(lib = ['bcm_host', 'vcos', 'vchiq_arm'], uselib_store = 'dispmanx', libpath='/opt/vc/lib') ++ ctx.check_cxx(lib = ['brcmEGL', 'brcmGLESv2', 'vchostif', 'bcm_host', 'vcos', 'vchiq_arm'], uselib_store = 'dispmanx', libpath='/opt/vc/lib') + + # Check optional packages + opt_pkgs = [('x11', 'x11', None, list_contains(ctx.options.flavors, 'x11')), +-- +2.28.0.497.g54e85e7af1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0002-run-dispmanx-fullscreen.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0002-run-dispmanx-fullscreen.patch new file mode 100644 index 000000000..27bd62edb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0002-run-dispmanx-fullscreen.patch @@ -0,0 +1,30 @@ +From 110ef8357ebaf24bc3995e631ec809a2f84c3b87 Mon Sep 17 00:00:00 2001 +From: Trevor Woerner <twoerner@gmail.com> +Date: Thu, 3 Dec 2020 07:16:58 -0500 +Subject: [PATCH] run dispmanx fullscreen + +The dispmanx flavour can only run fullscreen, therefore set the size to +fullscreen when glmark2-es2-dispmanx is run. + +Upstream-status: submitted [https://github.com/glmark2/glmark2/pull/135] +Signed-off-by: Trevor Woerner <twoerner@gmail.com> +--- + src/main.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/main.cpp b/src/main.cpp +index 677962e..273a217 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -164,6 +164,11 @@ main(int argc, char *argv[]) + Options::size = std::pair<int,int>(800, 600); + } + ++#if GLMARK2_USE_DISPMANX ++ /* dispmanx can only run fullscreen */ ++ Options::size = std::pair<int,int>(-1, -1); ++#endif ++ + // Create the canvas + #if GLMARK2_USE_X11 + NativeStateX11 native_state; diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 2e727a01c..44bce9fb5 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -1,31 +1,36 @@ SUMMARY = "OpenGL (ES) 2.0 benchmark" DESCRIPTION = "glmark2 is a benchmark for OpenGL (ES) 2.0. \ It uses only the subset of the OpenGL 2.0 API that is compatible with OpenGL ES 2.0." -HOMEPAGE = "https://launchpad.net/glmark2" -BUGTRACKER = "https://bugs.launchpad.net/glmark2" +HOMEPAGE = "https://github.com/glmark2/glmark2" +BUGTRACKER = "https://github.com/glmark2/glmark2/issues" LICENSE = "GPLv3+ & SGIv1" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.SGI;beginline=5;md5=269cdab4af6748677acce51d9aa13552" DEPENDS = "libpng jpeg udev" +DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-native', '', d)}" -PV = "20191226+${SRCPV}" +PV = "20201114+${SRCPV}" -COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" - -SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https" -SRCREV = "72dabc5d72b49c6d45badeb8a941ba4d829b0bd6" +SRC_URI = " \ + git://github.com/glmark2/glmark2.git;protocol=https \ + file://0001-fix-dispmanx-build.patch \ + file://0002-run-dispmanx-fullscreen.patch \ + " +SRCREV = "784aca755a469b144acf3cae180b6e613b7b057a" S = "${WORKDIR}/git" inherit waf pkgconfig features_check -REQUIRED_DISTRO_FEATURES += "opengl" +ANY_OF_DISTRO_FEATURES = "opengl dispmanx" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gles2', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gles2', '', d)} \ - drm-gles2" + ${@bb.utils.contains('DISTRO_FEATURES', 'dispmanx', 'dispmanx', '', d)} \ + drm-gles2 \ + " PACKAGECONFIG[x11-gl] = ",,virtual/libgl virtual/libx11" PACKAGECONFIG[x11-gles2] = ",,virtual/libgles2 virtual/libx11" @@ -33,6 +38,7 @@ PACKAGECONFIG[drm-gl] = ",,virtual/libgl libdrm virtual/libgbm" PACKAGECONFIG[drm-gles2] = ",,virtual/libgles2 libdrm virtual/libgbm" PACKAGECONFIG[wayland-gl] = ",,virtual/libgl wayland" PACKAGECONFIG[wayland-gles2] = ",,virtual/libgles2 wayland" +PACKAGECONFIG[dispmanx] = ",,virtual/libgles2 virtual/libx11" python __anonymous() { packageconfig = (d.getVar("PACKAGECONFIG") or "").split() @@ -49,6 +55,8 @@ python __anonymous() { flavors.append("drm-glesv2") if "drm-gl" in packageconfig: flavors.append("drm-gl") + if "dispmanx" in packageconfig: + flavors = ["dispmanx-glesv2"] if flavors: d.appendVar("EXTRA_OECONF", " --with-flavors=%s" % ",".join(flavors)) } diff --git a/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared/firmwared.service b/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared/firmwared.service new file mode 100644 index 000000000..c2106a251 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared/firmwared.service @@ -0,0 +1,9 @@ +[Unit] +Description=Linux Firmware Loader Daemon + +[Service] +Type=simple +ExecStart=@BINDIR@/firmwared -d /lib/firmware + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb b/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb new file mode 100644 index 000000000..43fc59815 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb @@ -0,0 +1,34 @@ +SUMMARY = "Linux Firmware Loader Daemon" +DESCRIPTION = "The Linux Firmware Loader Daemon monitors the kernel for \ +firmware requests and uploads the firmware blobs it has via the sysfs \ +interface." +HOMEPAGE = "https://github.com/teg/firmwared" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE-APACHE;md5=7b486c2338d225a1405d979ed2c15ce8 \ + file://COPYING;md5=daa868b8e1ae17d03228a1145b4060da" + +SRC_URI = "git://github.com/teg/firmwared.git \ + file://firmwared.service" + +PV = "0+git${SRCPV}" +SRCREV = "2e6b5db43d63a5c0283a4cae9a6a20b7ad107a04" + +S = "${WORKDIR}/git" + +DEPENDS = "glib-2.0 systemd" + +inherit pkgconfig autotools systemd features_check + +REQUIRED_DISTRO_FEATURES = "systemd" + +SYSTEMD_SERVICE_${PN} = "firmwared.service" + +do_configure_prepend() { + ${S}/autogen.sh +} + +do_install_append() { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/firmwared.service ${D}${systemd_system_unitdir} + sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/firmwared.service +} diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.12.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb index a18b71a7c..2f5e25c29 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.12.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb @@ -8,7 +8,7 @@ DEPENDS = "util-linux" PV .= "+git${SRCPV}" SRC_URI = "git://github.com/linux-nvme/nvme-cli.git" -SRCREV = "949d0aea730136d04af1fb9e0efd4427c20dee6d" +SRCREV = "f0e9569df9289d6ee55ba2c23615cc7c73a9b088" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio/0001-Modify-parameter-of-function-sctp_gensio_alloc.patch b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio/0001-Modify-parameter-of-function-sctp_gensio_alloc.patch new file mode 100644 index 000000000..22a452508 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio/0001-Modify-parameter-of-function-sctp_gensio_alloc.patch @@ -0,0 +1,29 @@ +From b94eff3461e4fb99cd761d6858e8ed94cb6c5412 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@cn.fujitsu.com> +Date: Tue, 8 Dec 2020 11:58:06 +0900 +Subject: [PATCH] 0001-Modify-parameter-of-function-sctp_gensio_alloc.patch + +parameter type of declearation is const, definition should also be +const. + +Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> +--- + lib/gensio_sctp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/gensio_sctp.c b/lib/gensio_sctp.c +index bd9437f..4278ff8 100644 +--- a/lib/gensio_sctp.c ++++ b/lib/gensio_sctp.c +@@ -1092,7 +1092,7 @@ str_to_sctp_gensio_accepter(const char *str, const char * const args[], + #else + + int +-sctp_gensio_alloc(struct gensio_addr *iai, const char * const args[], ++sctp_gensio_alloc(const struct gensio_addr *iai, const char * const args[], + struct gensio_os_funcs *o, + gensio_event cb, void *user_data, + struct gensio **new_gensio) +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.1.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.0.bb index 9d73da90d..424e176ca 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.1.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.0.bb @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ " -SRCREV = "998a017076a86179696a3ad811e2bae9155e46cb" +SRCREV = "4ec19138aa968dea34e4bc4e022c1ad7ed4c43c0" SRC_URI = "git://github.com/cminyard/gensio;protocol=https \ - " + file://0001-Modify-parameter-of-function-sctp_gensio_alloc.patch" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.17.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.17.2.bb index 6164c8248..29bcb48b1 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.17.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.17.2.bb @@ -14,7 +14,7 @@ DESCRIPTION = "Kerberos is a system for authenticating users and services on a n HOMEPAGE = "http://web.mit.edu/Kerberos/" SECTION = "console/network" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=aff541e7261f1926ac6a2a9a7bbab839" +LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=dd4d0ad4c5e98abb58aa0d312f276791" DEPENDS = "bison-native ncurses util-linux e2fsprogs e2fsprogs-native openssl" inherit autotools-brokensep binconfig perlnative systemd update-rc.d @@ -31,8 +31,8 @@ SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ file://krb5-kdc.service \ file://krb5-admin-server.service \ " -SRC_URI[md5sum] = "417d654c72526ac51466e7fe84608878" -SRC_URI[sha256sum] = "3706d7ec2eaa773e0e32d3a87bf742ebaecae7d064e190443a3acddfd8afb181" +SRC_URI[md5sum] = "aa4337fffa3b61f22dbd0167f708818f" +SRC_URI[sha256sum] = "1a4bba94df92f6d39a197a10687653e8bfbc9a2076e129f6eb92766974f86134" CVE_PRODUCT = "kerberos" CVE_VERSION = "5-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb index 3ee69554b..e0d3bef3c 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb @@ -19,6 +19,7 @@ PACKAGECONFIG ??= "instrumentation" PACKAGECONFIG_remove_mipsarch = "instrumentation" PACKAGECONFIG_remove_powerpc = "instrumentation" +PACKAGECONFIG_remove_riscv32 = "instrumentation" PACKAGECONFIG[instrumentation] = "--enable-instrumentation,--disable-instrumentation," diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.0.20.bb b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.1.6.bb index 5427daac4..6a3eb917f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.0.20.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.1.6.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8c47b078124308a4e1354e8d59f606b7" DEPENDS = "zlib" S = "${WORKDIR}/git" -SRCREV = "ec9e8ab892f2dc569ae09336c80c2796fd14a6ff" -SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.0-stable" +SRCREV = "736f0739ed8c75db0e29c7678b5a9194e957c347" +SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.1-stable" UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" @@ -18,18 +18,26 @@ PACKAGECONFIG ?= "libuv client server http2 ssl" PACKAGECONFIG[client] = "-DLWS_WITHOUT_CLIENT=OFF,-DLWS_WITHOUT_CLIENT=ON," PACKAGECONFIG[http2] = "-DLWS_WITH_HTTP2=ON,-DLWS_WITH_HTTP2=OFF," PACKAGECONFIG[ipv6] = "-DLWS_IPV6=ON,-DLWS_IPV6=OFF," +PACKAGECONFIG[libevent] = "-DLWS_WITH_LIBEVENT=ON,-DLWS_WITH_LIBEVENT=OFF,libevent" PACKAGECONFIG[libev] = "-DLWS_WITH_LIBEV=ON,-DLWS_WITH_LIBEV=OFF,libev" PACKAGECONFIG[libuv] = "-DLWS_WITH_LIBUV=ON,-DLWS_WITH_LIBUV=OFF,libuv" PACKAGECONFIG[server] = "-DLWS_WITHOUT_SERVER=OFF,-DLWS_WITHOUT_SERVER=ON," PACKAGECONFIG[ssl] = "-DLWS_WITH_SSL=ON,-DLWS_WITH_SSL=OFF,openssl" -PACKAGECONFIG[testapps] = "-DLWS_WITHOUT_TESTAPPS=OFF,-DLWS_WITHOUT_TESTAPPS=ON," +PACKAGECONFIG[static] = "-DLWS_WITH_STATIC=ON,-DLWS_WITH_STATIC=OFF -DLWS_LINK_TESTAPPS_DYNAMIC=ON," EXTRA_OECMAKE += " \ -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ " -PACKAGES =+ "${PN}-testapps" +PACKAGES =+ "${PN}-testapps ${PN}-evlib-event ${PN}-evlib-uv ${PN}-evlib-ev" -FILES_${PN}-testapps += "${datadir}/libwebsockets-test-server/*" +FILES_${PN}-testapps += "${datadir}/libwebsockets-test-server/* ${bindir}/libwebsockets-test-*" +FILES_${PN}-evlib-event += "${libdir}/libwebsockets-evlib_event.so" +FILES_${PN}-evlib-uv += "${libdir}/libwebsockets-evlib_uv.so" +FILES_${PN}-evlib-ev += "${libdir}/libwebsockets-evlib_ev.so" -CFLAGS_append = " -Wno-error" +RDEPENDS_${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libevent', '${PN}-evlib-event', '', d)}" +RDEPENDS_${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libuv', '${PN}-evlib-uv', '', d)}" +RDEPENDS_${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libev', '${PN}-evlib-ev', '', d)}" + +RDEPENDS_${PN}-dev += " ${@bb.utils.contains('PACKAGECONFIG', 'static', '${PN}-staticdev', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.8.bb index d5fe9bf00..609932ef7 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.8.bb @@ -12,7 +12,7 @@ inherit gnomebase gettext systemd vala gobject-introspection bash-completion DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" -SRC_URI[sha256sum] = "5fb5553aecd6eb9d6d8ecd130a24f3461e5f93c5f91a0e4ae0508b5228e8b0be" +SRC_URI[sha256sum] = "fe1a26ba51b4bda7abd09ad4dadedd87d8b8154809fc9d88e94f75fdfff19295" S = "${WORKDIR}/ModemManager-${PV}" PACKAGECONFIG ??= "mbim qmi \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.7.bb index 8e3557500..151228bcb 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.6.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.7.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \ SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http" -SRCREV = "e4c3757524a272c086e369cda5a56b8f766a401a" +SRCREV = "e047e25d34d53b4b265649144a3cac3b01eee76c" DEPENDS = "openssl" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.0.bb index 13794ad9d..6293d1229 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.0.bb @@ -9,7 +9,7 @@ DEPENDS = "gensio libyaml" SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" -SRC_URI[sha256sum] = "1d895f005896e8c5bcff4fe573e2fec3611bf4feee1247857e476b74323d916c" +SRC_URI[sha256sum] = "5e407d684d0aa0919ddd15af368f890c5940cddd6034b7efc363823f38f6ff0c" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_23.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_25.bb index c622e4857..1f62c142f 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_23.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_25.bb @@ -7,7 +7,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" -SRC_URI[sha256sum] = "95adfde56bce898c3b69eee0524732365e802348dd8189a35d5d00c30990dc81" +SRC_URI[sha256sum] = "a54fc5192280caf5824b82cb40f295c1195ad73c71bea5bd60218afb9df5bb29" UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases" @@ -17,6 +17,8 @@ DEPENDS = "expat systemd" DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit', '', d)}" +RDEPENDS_${PN} += "dbus-common" + REQUIRED_DISTRO_FEATURES = "systemd" SYSTEMD_SERVICE_${PN} = "${BPN}.service" diff --git a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.3.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.6.bb index fc4f5d649..7471308e4 100644 --- a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.6.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=959bffe2993816eb32ec4bc1ec1d5875" DEPENDS = "mm-common" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/3.0/libsigc++-${PV}.tar.xz" -SRC_URI[md5sum] = "8dca4559e732f47710370baa8bc2e66f" -SRC_URI[sha256sum] = "e4f4866a894bdbe053e4fb22ccc6bc4b6851fd31a4746fdd20b2cf6e87c6edb6" +SRC_URI[md5sum] = "8cc0c1df6b7d9c466555f4a2963ab06a" +SRC_URI[sha256sum] = "b70edcf4611651c54a426e109b17196e1fa17da090592a5000e2d134c03ac5ce" S = "${WORKDIR}/libsigc++-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2/0001-Fix-arguments-in-GLib.DBusSignalCallback-for-Vala-0..patch b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2/0001-Fix-arguments-in-GLib.DBusSignalCallback-for-Vala-0..patch new file mode 100644 index 000000000..65df09b1b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2/0001-Fix-arguments-in-GLib.DBusSignalCallback-for-Vala-0..patch @@ -0,0 +1,27 @@ +From 01a3a35631ba3996f7e912def66b4053a4f21df9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 3 Nov 2020 10:52:17 -0800 +Subject: [PATCH] Fix arguments in GLib.DBusSignalCallback for Vala 0.50 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/main.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main.vala b/src/main.vala +index 6d7132b0..b3183217 100644 +--- a/src/main.vala ++++ b/src/main.vala +@@ -403,7 +403,7 @@ class Commands : Object + return false; + } + +- public void signalHandler( GLib.DBusConnection conn, string sender, string path, string iface, string name, Variant params ) ++ public void signalHandler( GLib.DBusConnection conn, string? sender, string path, string iface, string name, Variant params ) + { + var line = "[SIGNAL] %s.%s %s %s\n%s".printf( + iface, +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb index 82f2cf8c9..71ab4d45a 100644 --- a/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb @@ -6,7 +6,9 @@ DEPENDS = "readline" PV = "2.3.3+git${SRCPV}" -SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=http" +SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=http \ + file://0001-Fix-arguments-in-GLib.DBusSignalCallback-for-Vala-0..patch \ + " SRCREV = "28202692d0b441000f4ddb8f347f72d1355021aa" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb index 937b3500c..36355dd92 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1238d5bccbb6bda30654e48dcc0a554b" SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https" -PV = "2.2.12+git${SRCPV}" -SRCREV = "a9e57b199ff1e8d03fa3e5c53c5544de3dc72fe6" +PV = "2.2.13+git${SRCPV}" +SRCREV = "3b7ded60ebb7e1afddcbae6f82ac8645b276e358" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb index a4f292475..0e29324cf 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb @@ -6,8 +6,8 @@ SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -PV = "2.0.11+git${SRCPV}" -SRCREV = "432b551429b362a877ed9b647b7114022b332be0" +PV = "2.0.12+git${SRCPV}" +SRCREV = "524f5ca96c3b9775f9d1debbdbcc2666bcce5c07" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 4d86ef977..2c46d21b7 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -87,6 +87,7 @@ RDEPENDS_packagegroup-meta-oe-bsp ="\ acpitool \ cpufrequtils \ edac-utils \ + firmwared \ flashrom \ irda-utils \ lmsensors-config-cgi \ @@ -192,6 +193,7 @@ RDEPENDS_packagegroup-meta-oe-crypto ="\ libsodium \ pkcs11-helper \ " +RDEPENDS_packagegroup-meta-oe-crypto_remove_riscv32 = "botan" RDEPENDS_packagegroup-meta-oe-dbs ="\ leveldb \ @@ -226,6 +228,7 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany-plugins geany", "", d)} \ lemon \ flatbuffers \ + heaptrack \ libubox \ ltrace \ lua \ @@ -281,7 +284,7 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\ xerces-c-samples \ xmlrpc-c \ yasm \ - json-schema-validator \ + json-schema-validator \ " RDEPENDS_packagegroup-meta-oe-devtools_append_x86 = " cpuid msr-tools pmtools" RDEPENDS_packagegroup-meta-oe-devtools_append_x86-64 = " cpuid msr-tools pcimem pmtools" @@ -297,8 +300,8 @@ RDEPENDS_packagegroup-meta-oe-devtools_remove_mips64el = "luajit nodejs" RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc = "android-tools breakpad lshw luajit uftrace" RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc64 = "android-tools lshw luajit uftrace" RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc64le = "android-tools lshw luajit uftrace" -RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv64 = "breakpad concurrencykit lshw ltrace luajit nodejs ply uftrace" -RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv32 = "breakpad concurrencykit lshw ltrace luajit nodejs ply uftrace" +RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv64 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace" +RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv32 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace" RDEPENDS_packagegroup-meta-oe-devtools_remove_aarch64 = "${@bb.utils.contains("TUNE_FEATURES", "crypto", "", "abseil-cpp", d)} concurrencykit" RDEPENDS_packagegroup-meta-oe-devtools_remove_x86-64 = "${@bb.utils.contains("TUNE_FEATURES", "corei7", "", "abseil-cpp", d)}" RDEPENDS_packagegroup-meta-oe-devtools_remove_x86 = "ply" @@ -594,6 +597,7 @@ RDEPENDS_packagegroup-meta-oe-kernel ="\ minicoredumper \ oprofile \ spidev-test \ + trace-cmd \ " RDEPENDS_packagegroup-meta-oe-kernel_append_x86 = " intel-speed-select ipmiutil pm-graph turbostat" RDEPENDS_packagegroup-meta-oe-kernel_append_x86-64 = " intel-speed-select ipmiutil kpatch pm-graph turbostat" @@ -613,7 +617,10 @@ RDEPENDS_packagegroup-meta-oe-kernel_remove_riscv32 = "crash makedumpfile oprofi RDEPENDS_packagegroup-meta-oe-multimedia ="\ alsa-oss \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "faad2", "", d)} \ - cdrkit \ + dirsplit \ + genisoimage \ + icedax \ + wodim \ id3lib \ audiofile \ a2jmidid \ @@ -935,6 +942,7 @@ RDEPENDS_packagegroup-meta-oe-ptest-packages_remove_arm = "numactl-ptest" RDEPENDS_packagegroup-meta-oe-fortran-packages = "\ lapack \ octave \ + suitesparse \ " # library-only or headers-only packages # They wont be built as part of images but might be interesting to include @@ -943,9 +951,8 @@ RDEPENDS_packagegroup-meta-oe-fortran-packages = "\ # opencl-headers sdbus-c++-libsystemd boost-url nlohmann-fifo sqlite-orm # nlohmann-json exprtk liblightmodbus p8platform gnome-doc-utils-stub # glm ttf-mplus xbitmaps ceres-solver cli11 fftw gnulib libeigen ade -# spdlog span-lite uthash websocketpp catch2 properties-cpp +# spdlog span-lite uthash websocketpp catch2 properties-cpp cpp-netlib # rsyslog conflicts with syslog-ng so its not included here EXCLUDE_FROM_WORLD = "1" - diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch b/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch deleted file mode 100644 index faabc597e..000000000 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9e5b1420b89813ee3c58c2b792077fa8bb71f327 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 21 May 2020 13:53:27 -0700 -Subject: [PATCH] Tackle SIGEMT and SIGSTKFLT is not glibc specific - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/portability.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lib/portability.c b/lib/portability.c -index 294141c6..1c7ebc12 100644 ---- a/lib/portability.c -+++ b/lib/portability.c -@@ -430,8 +430,11 @@ static const struct signame signames[] = { - // Non-POSIX signals that cause termination - SIGNIFY(PROF), SIGNIFY(IO), - #ifdef __linux__ --# if !defined(__GLIBC__) && !defined(__mips__) -+# ifdef SIGSTKFLT - SIGNIFY(STKFLT), -+# endif -+# ifdef SIGEMT -+ SIGNIFY(EMT), - # endif - SIGNIFY(POLL), SIGNIFY(PWR), - #elif defined(__APPLE__) --- -2.26.2 - diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch b/meta-openembedded/meta-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch deleted file mode 100644 index 7ab95932c..000000000 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch +++ /dev/null @@ -1,25 +0,0 @@ -glibc on mips is missing SIGSTKFLT - -Do not therefore assume it being available linuxwide - -Fixes -| lib/portability.c:433:3: error: use of undeclared identifier 'SIGSTKFLT' -| SIGNIFY(STKFLT), SIGNIFY(POLL), SIGNIFY(PWR), -| ^ - -Upstream-Status: Submitted [https://github.com/landley/toybox/pull/195] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/lib/portability.c -+++ b/lib/portability.c -@@ -430,7 +430,10 @@ static const struct signame signames[] = - // Non-POSIX signals that cause termination - SIGNIFY(PROF), SIGNIFY(IO), - #ifdef __linux__ -- SIGNIFY(STKFLT), SIGNIFY(POLL), SIGNIFY(PWR), -+# if !defined(__GLIBC__) && !defined(__mips__) -+ SIGNIFY(STKFLT), -+# endif -+ SIGNIFY(POLL), SIGNIFY(PWR), - #elif defined(__APPLE__) - SIGNIFY(EMT), SIGNIFY(INFO), - #endif diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.3.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.4.bb index 1513255c4..cc98b9ec0 100644 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.3.bb +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.4.bb @@ -8,10 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=78659a599b9325da368f2f1eb88f19c7" inherit cml1 update-alternatives SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ - file://mips-no-STKFLT.patch \ - file://0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch \ " -SRC_URI[sha256sum] = "eab28fd29d19d4e61ef09704e5871940e6f35fd35a3bb1285e41f204504b5c01" +SRC_URI[sha256sum] = "cb2a565a8d30015d08d73628795dca51a85b99b149aeabbbecd9e8dbdbd8fddc" SECTION = "base" diff --git a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.14.0.bb b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.14.0.bb index 42e89f639..13b2c6649 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.14.0.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.14.0.bb @@ -49,3 +49,5 @@ PACKAGES += "${PN}-python3" FILES_${PN}-python3 = "${libdir}/python3" RDEPENDS_${PN}-python3 += "python3" + +COMPATIBLE_HOST_riscv32 = "null" diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch new file mode 100644 index 000000000..9d9f63e34 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch @@ -0,0 +1,36 @@ +From 771dd6aa45dd0bbbb7d7c7a7b116e1b5666fbd7a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Nov 2020 18:05:48 -0800 +Subject: [PATCH] Disable use of __NR_io_getevents when not defined + +Architectures like riscv32 do not define this syscall, therefore return +ENOSYS on such architectures + +Upstream-Status: Submitted [https://github.com/smuellerDD/libkcapi/pull/100] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/internal.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +--- a/lib/internal.h ++++ b/lib/internal.h +@@ -325,10 +325,17 @@ static inline int io_submit(aio_context_ + return syscall(__NR_io_submit, ctx, n, iocb); + } + +-static inline int io_getevents(aio_context_t ctx, long min, long max, +- struct io_event *events, struct timespec *timeout) ++static inline int io_getevents(__attribute__((unused)) aio_context_t ctx, ++ __attribute__((unused)) long min, ++ __attribute__((unused)) long max, ++ __attribute__((unused)) struct io_event *events, ++ __attribute__((unused)) struct timespec *timeout) + { ++#ifdef __NR_io_getevents + return syscall(__NR_io_getevents, ctx, min, max, events, timeout); ++#else ++ return -ENOSYS; ++#endif + } + + /************************************************************ diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.0.bb b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb index b478e4c58..e76fba09c 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb @@ -6,8 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c78be93ed8d1637f2a3f4a83ff9d5f54" DEPENDS = "libtool" S = "${WORKDIR}/git" -SRCREV = "8397f0f7c45264a3b9aff5a1f9119df25eeb4c60" -SRC_URI = "git://github.com/smuellerDD/libkcapi.git" +SRCREV = "d41284525ec8960e9a828979cfe269012b7df8db" +SRC_URI = "git://github.com/smuellerDD/libkcapi.git \ + file://0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch \ + " inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb index 9b6e7ccbe..a7365f193 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb @@ -18,8 +18,8 @@ LIC_FILES_CHKSUM = " \ SRC_URI = "git://github.com/OpenSC/${BPN}.git" S = "${WORKDIR}/git" -# v1.26 -SRCREV = "c7a0cfa08ddc75d963a835d3588170af0e5f1115" +# v1.27 +SRCREV = "564a582d600c7eec7b8e303a22b575fd52622174" UPSTREAM_CHECK_GITTAGREGEX = "pkcs11-helper-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 7c92bbaad..e3ce29761 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -19,6 +19,7 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ file://0001-Fix-library-LZ4-lookup.patch \ + file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \ " SRC_URI[sha256sum] = "ff05dd69e9f6992caf1053242db704f04eda6f9accbcc98b74edfaf6013c45c4" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch new file mode 100644 index 000000000..0a2eed44f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch @@ -0,0 +1,37 @@ +From d611f78198dee64bb6a05933d200b544e2510b76 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 14 Nov 2020 14:37:13 -0800 +Subject: [PATCH] innobase: Define __NR_futex if it does not exist + +__NR_futex is not defines by newer architectures e.g. arc, riscv32 as +they only have 64bit variant of time_t. Glibc defines SYS_futex interface based +on +__NR_futex, since this is used in applications, such applications start +to fail to build for these newer architectures. This patch defines a +fallback to alias __NR_futex to __NR_futex_tim64 so SYS_futex keeps +working + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + storage/innobase/log/log0sync.cc | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/storage/innobase/log/log0sync.cc b/storage/innobase/log/log0sync.cc +index 7799e605..4fab8f74 100644 +--- a/storage/innobase/log/log0sync.cc ++++ b/storage/innobase/log/log0sync.cc +@@ -66,6 +66,9 @@ Note that if write operation is very fast, a) or b) can be fine as alternative. + #ifdef __linux__ + #include <linux/futex.h> + #include <sys/syscall.h> ++#if !defined(SYS_futex) && defined(SYS_futex_time64) ++# define SYS_futex SYS_futex_time64 ++#endif + #endif + + #include <atomic> +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc index 090e16f58..a1665ab2b 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -36,7 +36,7 @@ LEAD_SONAME = "libpq.so" # LDFLAGS for shared libraries export LDFLAGS_SL = "${LDFLAGS}" -inherit autotools pkgconfig perlnative python3native useradd update-rc.d systemd gettext cpan-base +inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext cpan-base CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6" diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch new file mode 100644 index 000000000..aa291daa3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch @@ -0,0 +1,47 @@ +From ddcc8a9f7e0f0bfee96f2f0a0c10f21f9fa9b05d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Nov 2020 15:02:28 -0800 +Subject: [PATCH] folly: Use SYS_futex for syscall + +glibc defines SYS_futex and on newer 32bit CPUs like RISCV-32, arc there +is no 32bit time_t therefore define SYS_futex in terms of SYS_futex_time64 + +Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/7676] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + third-party/folly/folly/detail/Futex.cpp | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/third-party/folly/folly/detail/Futex.cpp b/third-party/folly/folly/detail/Futex.cpp +index 62d6ea2b2..a914a8c73 100644 +--- a/third-party/folly/folly/detail/Futex.cpp ++++ b/third-party/folly/folly/detail/Futex.cpp +@@ -48,9 +48,15 @@ namespace { + #define FUTEX_CLOCK_REALTIME 256 + #endif + ++/// Newer 32bit CPUs eg. RISCV-32 are defaulting to 64bit time_t from get go and ++/// therefore do not define __NR_futex ++#if !defined(SYS_futex) && defined(SYS_futex_time64) ++# define SYS_futex SYS_futex_time64 ++#endif ++ + int nativeFutexWake(const void* addr, int count, uint32_t wakeMask) { + long rv = syscall( +- __NR_futex, ++ SYS_futex, + addr, /* addr1 */ + FUTEX_WAKE_BITSET | FUTEX_PRIVATE_FLAG, /* op */ + count, /* val */ +@@ -112,7 +118,7 @@ FutexResult nativeFutexWaitImpl( + // Unlike FUTEX_WAIT, FUTEX_WAIT_BITSET requires an absolute timeout + // value - http://locklessinc.com/articles/futex_cheat_sheet/ + long rv = syscall( +- __NR_futex, ++ SYS_futex, + addr, /* addr1 */ + op, /* op */ + expected, /* val */ +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb index 7ebc5ab1d..117a16b9e 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb @@ -6,13 +6,14 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" -SRCREV = "48bfca38f6f175435052a59791922a1a453d9609" -SRCBRANCH = "6.11.fb" -PV = "6.11.4" +SRCREV = "f3e33549c151f30ac4eb7c22356c6d0331f37652" +SRCBRANCH = "6.12.fb" +PV = "6.12.7" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \ file://0001-cmake-Add-check-for-atomic-support.patch \ file://0001-cmake-Use-exported-target-for-bz2.patch \ + file://0001-folly-Use-SYS_futex-for-syscall.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch new file mode 100644 index 000000000..43da4a9ef --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch @@ -0,0 +1,38 @@ +From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Nov 2020 12:10:28 -0800 +Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t + +mutex code uses SYS_futex, which it expects from system C library. +in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) +rv32 is using 64bit time_t from get go unlike other 32bit architectures +in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 +this aliases it to NR_futex so that SYS_futex is then defined for rv32 + +Upstream-Status: Submitted [https://github.com/capnproto/capnproto/pull/1103] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + c++/src/kj/mutex.c++ | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ +index c81cead7..e1594b11 100644 +--- a/c++/src/kj/mutex.c++ ++++ b/c++/src/kj/mutex.c++ +@@ -39,7 +39,13 @@ + + #ifndef SYS_futex + // Missing on Android/Bionic. ++#ifdef __NR_futex + #define SYS_futex __NR_futex ++#elif defined(SYS_futex_time64) ++#define SYS_futex SYS_futex_time64 ++#else ++#error "Need working SYS_futex" ++#endif + #endif + + #ifndef FUTEX_WAIT_PRIVATE +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb index 71f94badf..54e9daee7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb @@ -5,7 +5,9 @@ SECTION = "console/tools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9" -SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV}" +SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV} \ + file://0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch;patchdir=../ \ + " SRCREV = "57a4ca5af5a7f55b768a9d9d6655250bffb1257f" S = "${WORKDIR}/git/c++" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.13.bb b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.14.bb index e6174821f..0e33275e2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.13.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.14.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0" SRC_URI = "git://github.com/DaveGamble/cJSON.git" -SRCREV = "39853e5148dad8dc5d32ea2b00943cf4a0c6f120" +SRCREV = "d2735278ed1c2e4556f53a7a782063b31331dbf7" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.84.bb b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.88.bb index 3e46c726c..b6a4ae773 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.84.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.88.bb @@ -6,8 +6,8 @@ LICENSE="GPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" SRC_URI = "https://github.com/AlDanial/cloc/releases/download/${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "a52f3843825377cfa4e4b3b30a567ab4" -SRC_URI[sha256sum] = "c3f0a6bd2319110418ccb3e55a7a1b6d0edfd7528bfd2ae5d530938abe90f254" +SRC_URI[md5sum] = "9f12f29c824ef61c5eaba6cf2dd6e183" +SRC_URI[sha256sum] = "e4e30f083bf4e4a5efbe29efa0f6cefa223ba4e841ad1337653ad1f52702dc6f" UPSTREAM_CHECK_URI = "https://github.com/AlDanial/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb index 2a4209344..887b2a4f3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb @@ -4,10 +4,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master " -SRCREV = "95f3c6ab36840fb1e0f4935f34dbf8f708b7780c" +SRCREV = "6d3fab9b9559b6a483fe668e39c29126cdbb58d8" PV = "1.2" -SRC_URI_append_class-target = "file://oe-remote.repo.sample" +SRC_URI_append_class-target = " file://oe-remote.repo.sample" inherit distutils3-base diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb index 752562eb3..c25ce360e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb @@ -62,6 +62,6 @@ do_configure_prepend_toolchain-clang_x86() { BBCLASSEXTEND = "native nativesdk" -SYSROOT_DIRS_BLACKLIST_append_class-target = "${baselib}/cmake/grpc" +SYSROOT_DIRS_BLACKLIST_append_class-target = " ${baselib}/cmake/grpc" FILES_${PN}-dev += "${bindir}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0001-libheaptrack-Replace-__pid_t-with-pid_t.patch b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0001-libheaptrack-Replace-__pid_t-with-pid_t.patch new file mode 100644 index 000000000..9681086a5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0001-libheaptrack-Replace-__pid_t-with-pid_t.patch @@ -0,0 +1,26 @@ +From 18671cd6028f996c138c6eb4282caf313f3fc605 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 23 Nov 2020 15:25:18 -0800 +Subject: [PATCH] libheaptrack: Replace __pid_t with pid_t + +__pid_t is for internal libc use + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/track/libheaptrack.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/track/libheaptrack.cpp b/src/track/libheaptrack.cpp +index e138bce..4120ecd 100644 +--- a/src/track/libheaptrack.cpp ++++ b/src/track/libheaptrack.cpp +@@ -79,7 +79,7 @@ chrono::milliseconds elapsedTime() + return chrono::duration_cast<chrono::milliseconds>(clock::now() - startTime()); + } + +-__pid_t gettid() ++pid_t gettid() + { + return syscall(SYS_gettid); + } diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0002-heaptrack_inject-Include-dlfcn.h-for-dlopen-dlclose.patch b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0002-heaptrack_inject-Include-dlfcn.h-for-dlopen-dlclose.patch new file mode 100644 index 000000000..5fa802cb3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0002-heaptrack_inject-Include-dlfcn.h-for-dlopen-dlclose.patch @@ -0,0 +1,38 @@ +From 8ebcf5f2dd27dbeb6c81e9c40a5d17916cb243e6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 23 Nov 2020 15:26:31 -0800 +Subject: [PATCH] heaptrack_inject: Include dlfcn.h for dlopen/dlclose + +Do not use __WORDSIZE which is for libc internal use + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/track/heaptrack_inject.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/track/heaptrack_inject.cpp b/src/track/heaptrack_inject.cpp +index 325d87e..fb1c154 100644 +--- a/src/track/heaptrack_inject.cpp ++++ b/src/track/heaptrack_inject.cpp +@@ -28,6 +28,7 @@ + #include <link.h> + #include <malloc.h> + #include <unistd.h> ++#include <dlfcn.h> + + #include <sys/mman.h> + +@@ -39,9 +40,10 @@ + * @brief Experimental support for symbol overloading after runtime injection. + */ + +-#if __WORDSIZE == 64 ++#include <limits.h> ++#if ULONG_MAX == 0xffffffffffffffff + #define ELF_R_SYM(i) ELF64_R_SYM(i) +-#elif __WORDSIZE == 32 ++#elif ULONG_MAX == 0xffffffff + #define ELF_R_SYM(i) ELF32_R_SYM(i) + #else + #error unsupported word size diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0003-heaptrack_preload-Make-noexcept-attribute-conditiona.patch b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0003-heaptrack_preload-Make-noexcept-attribute-conditiona.patch new file mode 100644 index 000000000..c3c852e39 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0003-heaptrack_preload-Make-noexcept-attribute-conditiona.patch @@ -0,0 +1,118 @@ +From b8435c6523d9377f04d5e21629f3dc68b8865016 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 23 Nov 2020 15:31:45 -0800 +Subject: [PATCH] heaptrack_preload: Make noexcept attribute conditional + +musl does not define these functions with noexcept and hence compiler +complains about them + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/track/heaptrack_preload.cpp | 26 ++++++++++++++++---------- + 1 file changed, 16 insertions(+), 10 deletions(-) + +diff --git a/src/track/heaptrack_preload.cpp b/src/track/heaptrack_preload.cpp +index 63110ce..ee85331 100644 +--- a/src/track/heaptrack_preload.cpp ++++ b/src/track/heaptrack_preload.cpp +@@ -171,11 +171,17 @@ void init() + } + } + ++#ifdef __GLIBC__ ++#define NOEXECPT noexcept ++#else ++#define NOEXECPT ++#endif ++ + extern "C" { + + /// TODO: memalign, pvalloc, ...? + +-void* malloc(size_t size) noexcept ++void* malloc(size_t size) NOEXECPT + { + if (!hooks::malloc) { + hooks::init(); +@@ -186,7 +192,7 @@ void* malloc(size_t size) noexcept + return ptr; + } + +-void free(void* ptr) noexcept ++void free(void* ptr) NOEXECPT + { + if (!hooks::free) { + hooks::init(); +@@ -204,7 +210,7 @@ void free(void* ptr) noexcept + hooks::free(ptr); + } + +-void* realloc(void* ptr, size_t size) noexcept ++void* realloc(void* ptr, size_t size) NOEXECPT + { + if (!hooks::realloc) { + hooks::init(); +@@ -219,7 +225,7 @@ void* realloc(void* ptr, size_t size) noexcept + return ret; + } + +-void* calloc(size_t num, size_t size) noexcept ++void* calloc(size_t num, size_t size) NOEXECPT + { + if (!hooks::calloc) { + hooks::init(); +@@ -235,7 +241,7 @@ void* calloc(size_t num, size_t size) noexcept + } + + #if HAVE_CFREE +-void cfree(void* ptr) noexcept ++void cfree(void* ptr) NOEXECPT + { + if (!hooks::cfree) { + hooks::init(); +@@ -252,7 +258,7 @@ void cfree(void* ptr) noexcept + } + #endif + +-int posix_memalign(void** memptr, size_t alignment, size_t size) noexcept ++int posix_memalign(void** memptr, size_t alignment, size_t size) NOEXECPT + { + if (!hooks::posix_memalign) { + hooks::init(); +@@ -268,7 +274,7 @@ int posix_memalign(void** memptr, size_t alignment, size_t size) noexcept + } + + #if HAVE_ALIGNED_ALLOC +-void* aligned_alloc(size_t alignment, size_t size) noexcept ++void* aligned_alloc(size_t alignment, size_t size) NOEXECPT + { + if (!hooks::aligned_alloc) { + hooks::init(); +@@ -285,7 +291,7 @@ void* aligned_alloc(size_t alignment, size_t size) noexcept + #endif + + #if HAVE_VALLOC +-void* valloc(size_t size) noexcept ++void* valloc(size_t size) NOEXECPT + { + if (!hooks::valloc) { + hooks::init(); +@@ -301,7 +307,7 @@ void* valloc(size_t size) noexcept + } + #endif + +-void* dlopen(const char* filename, int flag) noexcept ++void* dlopen(const char* filename, int flag) NOEXECPT + { + if (!hooks::dlopen) { + hooks::init(); +@@ -316,7 +322,7 @@ void* dlopen(const char* filename, int flag) noexcept + return ret; + } + +-int dlclose(void* handle) noexcept ++int dlclose(void* handle) NOEXECPT + { + if (!hooks::dlclose) { + hooks::init(); diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0004-backtrace-Always-include-stdint.h.patch b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0004-backtrace-Always-include-stdint.h.patch new file mode 100644 index 000000000..3db03cf85 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0004-backtrace-Always-include-stdint.h.patch @@ -0,0 +1,42 @@ +From 200f71ea8c0756594ac7e079ccc686d9a20cea5c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 23 Nov 2020 15:32:58 -0800 +Subject: [PATCH] backtrace: Always include stdint.h + +in OE we will always have system headers which supports C99/stdint.h + +Upstream-Status: Inappropriate [Unless upstream drops legacy] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + 3rdparty/libbacktrace/backtrace.h | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/3rdparty/libbacktrace/backtrace.h b/3rdparty/libbacktrace/backtrace.h +index 14863cf..d0ac38f 100644 +--- a/3rdparty/libbacktrace/backtrace.h ++++ b/3rdparty/libbacktrace/backtrace.h +@@ -36,24 +36,8 @@ POSSIBILITY OF SUCH DAMAGE. */ + #include <stddef.h> + #include <stdio.h> + +-/* We want to get a definition for uintptr_t, but we still care about +- systems that don't have <stdint.h>. */ +-#if defined(__GLIBC__) && __GLIBC__ >= 2 +- +-#include <stdint.h> +- +-#elif defined(HAVE_STDINT_H) +- + #include <stdint.h> + +-#else +- +-/* Systems that don't have <stdint.h> must provide gstdint.h, e.g., +- from GCC_HEADER_STDINT in configure.ac. */ +-#include "gstdint.h" +- +-#endif +- + #ifdef __cplusplus + extern "C" { + #endif diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb new file mode 100644 index 000000000..f2235afef --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "Heap memory profiler for Linux" +DESCRIPTION = "Heaptrack traces all memory allocations and annotates these \ +events with stack traces. Dedicated analysis tools then allow you to interpret \ +the heap memory profile to find hotspots to reduce memory, leaks, allocation \ +hotspots and temporary allocations" +HOMEPAGE = "https://phabricator.kde.org/source/heaptrack/" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "zlib boost libunwind elfutils" + +SRC_URI = "git://github.com/KDE/heaptrack.git;protocol=https \ + file://0001-libheaptrack-Replace-__pid_t-with-pid_t.patch \ + file://0002-heaptrack_inject-Include-dlfcn.h-for-dlopen-dlclose.patch \ + file://0003-heaptrack_preload-Make-noexcept-attribute-conditiona.patch \ + file://0004-backtrace-Always-include-stdint.h.patch \ + " + +SRCREV = "bc9e3744bcc47de978673d1e382f4125a1ab5fa8" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += "-DHEAPTRACK_BUILD_GUI=OFF" + +# libunwind is not yet ported to RISCV +COMPATIBLE_HOST_riscv32 = "null" +COMPATIBLE_HOST_riscv64 = "null" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb b/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb index 7d84ea60b..60c33d658 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb @@ -31,7 +31,7 @@ PACKAGECONFIG ??= "readline" PACKAGECONFIG[readline] = ",,readline" UCLIBC_PATCHES += "file://uclibc-pthread.patch" -SRC_URI_append_libc-uclibc = "${UCLIBC_PATCHES}" +SRC_URI_append_libc-uclibc = " ${UCLIBC_PATCHES}" TARGET_CC_ARCH += " -fPIC ${LDFLAGS}" EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -fPIC' MYLDFLAGS='${LDFLAGS}'" diff --git a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch new file mode 100644 index 000000000..6fee0526d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch @@ -0,0 +1,43 @@ +From 8c0e4b7907eb577b1e5214f9a7bc75d5c3263b0a Mon Sep 17 00:00:00 2001 +From: Ariadne Conill <ariadne@dereferenced.org> +Date: Sat, 14 Nov 2020 22:55:30 -0700 +Subject: [PATCH] Fix build under GCC -fno-common. + +Upstream-Status: Submitted [https://github.com/pikhq/musl-nscd/pull/11] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/modules.h | 4 ++-- + src/main.c | 3 +++ + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/include/modules.h b/include/modules.h +index 70c1960..e77ec58 100644 +--- a/include/modules.h ++++ b/include/modules.h +@@ -28,7 +28,7 @@ struct mod_passwd { + link_t link; + }; + +-list_t passwd_mods; +-list_t group_mods; ++extern list_t passwd_mods; ++extern list_t group_mods; + + #endif +diff --git a/src/main.c b/src/main.c +index c1a78bb..808ef74 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -18,6 +18,9 @@ + #include "parse.h" + #include "util.h" + ++list_t passwd_mods; ++list_t group_mods; ++ + static void *get_dll(const char *service) + { + char *path; +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch new file mode 100644 index 000000000..691aa3d2a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch @@ -0,0 +1,29 @@ +From 4d09032741475c4e9d3de62c8187597f3f72f934 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 22 Nov 2020 12:32:01 -0800 +Subject: [PATCH] configure: Check for flex if lex is not found + +lex is already checked by this time, therefore check should be to find +flex +Upstream-Status: Submitted [https://github.com/pikhq/musl-nscd/pull/12] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 256824a..4c94568 100755 +--- a/configure ++++ b/configure +@@ -249,7 +249,7 @@ printf "checking for lex... " + trylex ${CROSS_COMPILE}lex + trylex lex + trylex ${CROSS_COMPILE}flex +-trylex lex ++trylex flex + printf "%s\n" "$LEX" + test -n "$LEX" || echo "$0: cannot find lex. Will try to use pre-provided source." + +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb index 374f94409..83125a1ba 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb @@ -7,12 +7,15 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9bf479a145bcaff8489e743da58afeee" SECTION = "utils" -PV = "1.0.2" +DEPENDS += "flex-native bison-native flex bison" -CFLAGS += "-fcommon" +PV = "1.0.2" -SRCREV = "8f278675e1b6a3a02c8ee1b8ca000f80570dc5d6" -SRC_URI = "git://github.com/pikhq/musl-nscd" +SRCREV = "af581482a3e1059458f3c8b20a56f82807ca3bd4" +SRC_URI = "git://github.com/pikhq/musl-nscd \ + file://0001-Fix-build-under-GCC-fno-common.patch \ + file://0001-configure-Check-for-flex-if-lex-is-not-found.patch \ + " UPSTREAM_CHECK_COMMITS = "1" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch new file mode 100644 index 000000000..a23f1c243 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch @@ -0,0 +1,53 @@ +From be8d3cd6eab4b8f9849133060abb1aba4400276b Mon Sep 17 00:00:00 2001 +From: Amy Huang <akhuang@google.com> +Date: Thu, 23 Apr 2020 11:25:53 -0700 +Subject: [PATCH] Remove use of register r7 because llvm now issues an error + when "r7" is used (starting in commit d85b3877) + +Bug: chromium:1073270 +Change-Id: I7ec8112f170b98d2edaf92bc9341e738f8de07a3 +Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2163435 +Reviewed-by: Nico Weber <thakis@chromium.org> +Reviewed-by: Ross McIlroy <rmcilroy@chromium.org> +Commit-Queue: Nico Weber <thakis@chromium.org> +Cr-Commit-Position: refs/heads/master@{#67371} +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Backport [https://chromium.googlesource.com/v8/v8/+/00604cd2806b5d26bef592dd19989a234bd07a4b%5E%21/] + deps/v8/src/codegen/arm/cpu-arm.cc | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/deps/v8/src/codegen/arm/cpu-arm.cc b/deps/v8/src/codegen/arm/cpu-arm.cc +index 868f360..654d68f 100644 +--- a/deps/v8/src/codegen/arm/cpu-arm.cc ++++ b/deps/v8/src/codegen/arm/cpu-arm.cc +@@ -30,18 +30,6 @@ V8_NOINLINE void CpuFeatures::FlushICache(void* start, size_t size) { + register uint32_t end asm("r1") = beg + size; + register uint32_t flg asm("r2") = 0; + +-#ifdef __clang__ +- // This variant of the asm avoids a constant pool entry, which can be +- // problematic when LTO'ing. It is also slightly shorter. +- register uint32_t scno asm("r7") = __ARM_NR_cacheflush; +- +- asm volatile("svc 0\n" +- : +- : "r"(beg), "r"(end), "r"(flg), "r"(scno) +- : "memory"); +-#else +- // Use a different variant of the asm with GCC because some versions doesn't +- // support r7 as an asm input. + asm volatile( + // This assembly works for both ARM and Thumb targets. + +@@ -59,7 +47,6 @@ V8_NOINLINE void CpuFeatures::FlushICache(void* start, size_t size) { + : "r"(beg), "r"(end), "r"(flg), [scno] "i"(__ARM_NR_cacheflush) + : "memory"); + #endif +-#endif + #endif // !USE_SIMULATOR + } + +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.18.3.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.19.0.bb index 8a9f32bce..9d1558623 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.18.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.19.0.bb @@ -21,11 +21,12 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0004-v8-don-t-override-ARM-CFLAGS.patch \ file://big-endian.patch \ file://mips-warnings.patch \ + file://0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch \ " SRC_URI_append_class-target = " \ file://0002-Using-native-binaries.patch \ " -SRC_URI[sha256sum] = "71158026579487422fd13cc2553b34cddb76519098aa6030faab52f88c6e0d0e" +SRC_URI[sha256sum] = "3b671c45c493f96d7e018c15110cdbafa4478e5e5cfc9e6eec83cea9e6b551e1" S = "${WORKDIR}/node-v${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb index 4f6aaa8a6..05e06a25d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -54,3 +54,6 @@ FILES_${PN} = " \ PACKAGECONFIG[sysfsgpio] = "--enable-sysfsgpio,--disable-sysfsgpio" PACKAGECONFIG[remote-bitbang] = "--enable-remote-bitbang,--disable-remote-bitbang" PACKAGECONFIG ??= "sysfsgpio remote-bitbang" + +# Can't be built with ccache +CCACHE_DISABLE = "1" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.14.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.15.bb index 1ab21d1dc..7b1a8a639 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.14.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.15.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=12;md5=b2562f94907eeb42 SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Tty-${PV}.tar.gz" -SRC_URI[md5sum] = "70bcec4b1b19838ed209fb96a13f3e89" -SRC_URI[sha256sum] = "51f3e4e311128bdb2c6a15f02c51376cb852ccf9df9bebe8dfbb5f9561eb95b5" +SRC_URI[md5sum] = "060103c6d6e4d9833fa7715860f2923b" +SRC_URI[sha256sum] = "43f9cc0f87620bbb159e0890e196b23a8e6419cbd04224c10f3dcee948f6b51a" S = "${WORKDIR}/IO-Tty-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb index abd8b1672..1da560783 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb @@ -155,7 +155,6 @@ do_install_prepend_class-target() { # fixme do_install_append_class-target() { install -d ${D}${sysconfdir}/ - rm -rf ${D}/${TMPDIR} rm -rf ${D}/.registry rm -rf ${D}/.channels rm -rf ${D}/.[a-z]* @@ -179,14 +178,6 @@ do_install_append_class-target() { ${D}${systemd_unitdir}/system/php-fpm.service fi - TMP=`dirname ${D}/${TMPDIR}` - while test ${TMP} != ${D}; do - if [ -d ${TMP} ]; then - rmdir ${TMP} - fi - TMP=`dirname ${TMP}`; - done - if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/apache2/modules.d install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.13.0.1.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.14.0.bb index 8c349db4d..31e3bcc5b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.13.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.14.0.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" -SRCREV = "d1eca4e4b421cd2997495c4b4e65cea6be4e9b8a" +SRCREV = "2514f0bd7da7e2af1bed4c5d1b84f031c4d12c10" SRC_URI = "git://github.com/protocolbuffers/protobuf.git \ file://run-ptest \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.10.bb b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.11.bb index 6f624910b..b5e63cd35 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.10.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.11.bb @@ -10,8 +10,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=d5ee91fb74cbb64223b3693fd64eb169" SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "f97237e9908201c6d8536210747b66af" -SRC_URI[sha256sum] = "55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a" +SRC_URI[md5sum] = "93540f4644fd4e4b02049554ef37fb90" +SRC_URI[sha256sum] = "26913d3e63b9c07431401cf826df17ed832a20d19333d043991e611d23beaa2c" UPSTREAM_CHECK_URI = "https://github.com/zeux/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch new file mode 100644 index 000000000..c955b5fa7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch @@ -0,0 +1,43 @@ +From 83628b471a1a79dae50bb158fca9448b668dd3a6 Mon Sep 17 00:00:00 2001 +From: Gregory Anders <greg@gpanders.com> +Date: Wed, 21 Oct 2020 10:43:16 -0600 +Subject: [PATCH] Preserve CXXFLAGS from environment in Mongoose + +This allows CXXFLAGS set in the environment to also be used in the CMake +build process, instead of overwriting them. This is useful in a cross +compile context where the CXXFLAGS variable might contain necessary +flags for cross compiling. +--- + Mongoose/CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Mongoose/CMakeLists.txt b/Mongoose/CMakeLists.txt +index 7e134ab..91a7f70 100644 +--- a/Mongoose/CMakeLists.txt ++++ b/Mongoose/CMakeLists.txt +@@ -321,14 +321,14 @@ add_test(Unit_Test_EdgeSep ./tests/mongoose_unit_test_edgesep) + message(STATUS "CMAKE_CXX_COMPILER: " ${BoldBlue} ${CMAKE_CXX_COMPILER_ID} ${ColourReset}) + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") + # using Clang +- SET(CMAKE_CXX_FLAGS "-O3 -fwrapv") ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fwrapv") + # Debug flags for Clang + SET(CMAKE_CXX_FLAGS_DEBUG "--coverage -g -fwrapv") + SET(CMAKE_C_FLAGS_DEBUG "--coverage -g") + SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "--coverage -g") + elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + # using GCC +- SET(CMAKE_CXX_FLAGS "-O3 -fwrapv") ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fwrapv") + # Debug flags for GCC + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.6") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") +@@ -339,7 +339,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "-fprofile-arcs -ftest-coverage") + elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") + # using Intel C++ +- SET(CMAKE_CXX_FLAGS "-O3 -no-prec-div -xHOST -ipo -fwrapv") ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -no-prec-div -xHOST -ipo -fwrapv") + # Debug flags for Intel + SET(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -fwrapv") + SET(CMAKE_C_FLAGS_DEBUG "-g -O0 -Wall") diff --git a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0002-Preserve-links-when-installing-libmetis.patch b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0002-Preserve-links-when-installing-libmetis.patch new file mode 100644 index 000000000..190eaf164 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0002-Preserve-links-when-installing-libmetis.patch @@ -0,0 +1,22 @@ +From 31175fb408a4f5e85e39a9aabd4a29f9d9c1fe25 Mon Sep 17 00:00:00 2001 +From: Gregory Anders <greg@gpanders.com> +Date: Wed, 21 Oct 2020 15:26:52 -0600 +Subject: [PATCH] Preserve links when installing libmetis + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 7631955..57fd022 100644 +--- a/Makefile ++++ b/Makefile +@@ -76,7 +76,7 @@ ifeq (,$(MY_METIS_LIB)) + @mkdir -p $(INSTALL_LIB) + @mkdir -p $(INSTALL_INCLUDE) + @mkdir -p $(INSTALL_DOC) +- - $(CP) lib/libmetis.* $(INSTALL_LIB) ++ - $(CP) -d lib/libmetis.* $(INSTALL_LIB) + - $(CP) metis-5.1.0/manual/manual.pdf $(INSTALL_DOC)/METIS_manual.pdf + - $(CP) metis-5.1.0/README.txt $(INSTALL_DOC)/METIS_README.txt + # the following is needed only on the Mac, so *.dylib is hardcoded: diff --git a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0003-Add-version-information-to-libmetis.patch b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0003-Add-version-information-to-libmetis.patch new file mode 100644 index 000000000..dee6039a8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0003-Add-version-information-to-libmetis.patch @@ -0,0 +1,49 @@ +From 11ab355fdda93b762fcc07ac3f7c6ab1be0a5f5a Mon Sep 17 00:00:00 2001 +From: Gregory Anders <greg@gpanders.com> +Date: Wed, 21 Oct 2020 15:27:07 -0600 +Subject: [PATCH] Add version information to libmetis + +--- + metis-5.1.0/Makefile | 8 ++++---- + metis-5.1.0/libmetis/CMakeLists.txt | 1 + + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/metis-5.1.0/Makefile b/metis-5.1.0/Makefile +index 9cc03b9..c445d85 100644 +--- a/metis-5.1.0/Makefile ++++ b/metis-5.1.0/Makefile +@@ -18,8 +18,11 @@ systype = $(shell uname -s) + + BUILDDIR = build/$(systype)-$(cputype) + ++VERNUM=5.1.0 ++PKGNAME=metis-$(VERNUM) ++ + # Process configuration options. +-CONFIG_FLAGS = ++CONFIG_FLAGS = -DMETIS_VERSION=$(VERNUM) + ifeq ($(gklib_path), not-set) + gklib_path = GKlib + endif +@@ -52,9 +55,6 @@ ifneq ($(cc), not-set) + CONFIG_FLAGS += -DCMAKE_C_COMPILER=$(cc) + endif + +-VERNUM=5.1.0 +-PKGNAME=metis-$(VERNUM) +- + JOBS ?= 1 + + define run-config +diff --git a/metis-5.1.0/libmetis/CMakeLists.txt b/metis-5.1.0/libmetis/CMakeLists.txt +index 120e94d..11bde87 100644 +--- a/metis-5.1.0/libmetis/CMakeLists.txt ++++ b/metis-5.1.0/libmetis/CMakeLists.txt +@@ -4,6 +4,7 @@ include_directories(.) + file(GLOB metis_sources *.c) + # Build libmetis. + add_library(metis ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources}) ++set_target_properties(metis PROPERTIES VERSION ${METIS_VERSION}) + if(UNIX) + target_link_libraries(metis m) + endif() diff --git a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb new file mode 100644 index 000000000..9ccf2d0bf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb @@ -0,0 +1,80 @@ +LICENSE = "GPLv2 & GPLv3 & BSD-3-Clause & LGPL-2.0 & Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f9f2b9d61cb769a67c4cd079e1166de7" +SRC_URI = "git://github.com/DrTimothyAldenDavis/SuiteSparse;protocol=https \ + file://0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch \ + file://0002-Preserve-links-when-installing-libmetis.patch \ + file://0003-Add-version-information-to-libmetis.patch \ + " + +SRC_URI[md5sum] = "c414679bbc9432a3def01b31ad921140" +SRC_URI[sha256sum] = "06726e471fbaa55f792578f9b4ab282ea9d008cf39ddcc3b42b73400acddef40" + +SRCREV = "v${PV}" + +S = "${WORKDIR}/git" + +DEPENDS = "cmake-native lapack gmp mpfr chrpath-native" + +PROVIDES = "mongoose graphblas" +RPROVIDES_${PN} = "mongoose graphblas" + +# The values of $CC, $CXX, and $LD that Bitbake uses have spaces in them which +# causes problems when the SuiteSparse Makefiles try to pass these values on +# the command line. To get around this problem, set these variables to only the +# program name and prepend the rest of the value onto the corresponding FLAGS +# variable. +CFLAGS_prepend := "${@" ".join(d.getVar('CC', True).split()[1:])} " +export CC := "${@d.getVar('CC', True).split()[0]}" + +CXXFLAGS_prepend := "${@" ".join(d.getVar('CXX', True).split()[1:])} " +export CXX := "${@d.getVar('CXX', True).split()[0]}" + +LDFLAGS_prepend := "${@" ".join(d.getVar('LD', True).split()[1:])} " +export LD := "${@d.getVar('LD', True).split()[0]}" + +export CMAKE_OPTIONS = " \ + -DCMAKE_INSTALL_PREFIX=${D}${prefix} \ + -DCMAKE_INSTALL_LIBDIR=${baselib} \ +" + +do_compile () { + oe_runmake library +} + +do_install () { + oe_runmake prefix=${D}${prefix} INSTALL=${D}${prefix} install + + # Remove runtime paths from shared libraries + for file in ${D}${libdir}/*.so.*; do + if [ ! -L "$file" ]; then + chrpath -d "$file" + fi + done +} + +FILES_${PN} += " \ + ${libdir}/libmongoose.so.* \ + ${libdir}/libgraphblas.so.* \ + ${libdir}/libmetis.so.* \ + ${libdir}/libsuitesparseconfig.so.* \ + ${libdir}/libamd.so.* \ + ${libdir}/libbtf.so.* \ + ${libdir}/libcamd.so.* \ + ${libdir}/libccolamd.so.* \ + ${libdir}/libcolamd.so.* \ + ${libdir}/libcholmod.so.* \ + ${libdir}/libcxsparse.so.* \ + ${libdir}/libldl.so.* \ + ${libdir}/libklu.so.* \ + ${libdir}/libumfpack.so.* \ + ${libdir}/librbio.so.* \ + ${libdir}/libspqr.so.* \ + ${libdir}/libsliplu.so.* \ + ${bindir}/mongoose \ +" + +FILES_${PN}-staticdev += "${libdir}/libmongoose.a" +FILES_${PN}-dev += "${includedir} ${libdir}/*.so" + +EXCLUDE_FROM_WORLD = "1" + diff --git a/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.2.2.bb b/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.2.2.bb new file mode 100644 index 000000000..cafc86964 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.2.2.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "beep is a command line tool for linux that beeps the PC speaker" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" + +SRC_URI = "\ + http://johnath.com/beep/beep-${PV}.tar.gz \ + file://linux-input.patch \ +" + +SRC_URI[sha256sum] = "5c0445dac43950b7c7c3f235c6fb21f620ab3fd2f3aafaf09896e5730fcf49a1" + +S = "${WORKDIR}/${BPN}-${PV}" + +EXTRA_OEMAKE += 'CC="${CC}"' +EXTRA_OEMAKE += 'FLAGS="${CFLAGS} ${LDFLAGS}"' + +do_configure[noexec] = "1" + +do_compile() { + oe_runmake +} + +do_install() { + install -Dm 0755 ${B}/${PN} ${D}${bindir}/${PN} +} diff --git a/meta-openembedded/meta-oe/recipes-extended/beep/files/linux-input.patch b/meta-openembedded/meta-oe/recipes-extended/beep/files/linux-input.patch new file mode 100644 index 000000000..1b38ba72a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/beep/files/linux-input.patch @@ -0,0 +1,155 @@ +# the diff between Alessandro Zummo's copy of beep.c and the original +# one... + +--- beep-1.2.2/beep.c.orig 2006-01-29 12:13:36.994560551 -0800 ++++ beep-1.2.2/beep.c 2006-01-29 12:35:02.950558713 -0800 +@@ -26,6 +26,7 @@ + #include <sys/ioctl.h> + #include <sys/types.h> + #include <linux/kd.h> ++#include <linux/input.h> + + /* I don't know where this number comes from, I admit that freely. A + wonderful human named Raine M. Ekman used it in a program that played +@@ -86,18 +87,28 @@ typedef struct beep_parms_t { + struct beep_parms_t *next; /* in case -n/--new is used. */ + } beep_parms_t; + ++enum { BEEP_TYPE_CONSOLE, BEEP_TYPE_EVDEV }; ++ + /* Momma taught me never to use globals, but we need something the signal + handlers can get at.*/ + int console_fd = -1; ++int console_type = BEEP_TYPE_CONSOLE; ++char *console_device = NULL; ++ ++void do_beep(int freq); + + /* If we get interrupted, it would be nice to not leave the speaker beeping in + perpetuity. */ + void handle_signal(int signum) { ++ ++ if(console_device) ++ free(console_device); ++ + switch(signum) { + case SIGINT: + if(console_fd >= 0) { + /* Kill the sound, quit gracefully */ +- ioctl(console_fd, KIOCSOUND, 0); ++ do_beep(0); + close(console_fd); + exit(signum); + } else { +@@ -110,7 +121,7 @@ void handle_signal(int signum) { + /* print usage and exit */ + void usage_bail(const char *executable_name) { + printf("Usage:\n%s [-f freq] [-l length] [-r reps] [-d delay] " +- "[-D delay] [-s] [-c]\n", ++ "[-D delay] [-s] [-c] [-e device]\n", + executable_name); + printf("%s [Options...] [-n] [--new] [Options...] ... \n", executable_name); + printf("%s [-h] [--help]\n", executable_name); +@@ -141,11 +152,12 @@ void usage_bail(const char *executable_n + void parse_command_line(int argc, char **argv, beep_parms_t *result) { + int c; + +- struct option opt_list[4] = {{"help", 0, NULL, 'h'}, ++ struct option opt_list[] = {{"help", 0, NULL, 'h'}, + {"version", 0, NULL, 'V'}, + {"new", 0, NULL, 'n'}, ++ {"device", 1, NULL, 'e'}, + {0,0,0,0}}; +- while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVn", opt_list, NULL)) ++ while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVne:", opt_list, NULL)) + != EOF) { + int argval = -1; /* handle parsed numbers for various arguments */ + float argfreq = -1; +@@ -207,6 +219,9 @@ void parse_command_line(int argc, char * + result->next->next = NULL; + result = result->next; /* yes, I meant to do that. */ + break; ++ case 'e' : /* also --device */ ++ console_device = strdup(optarg); ++ break; + case 'h' : /* notice that this is also --help */ + default : + usage_bail(argv[0]); +@@ -214,26 +229,61 @@ void parse_command_line(int argc, char * + } + } + ++void do_beep(int freq) ++{ ++ if (console_type == BEEP_TYPE_CONSOLE) ++ { ++ if(ioctl(console_fd, KIOCSOUND, freq != 0 ++ ? (int)(CLOCK_TICK_RATE/freq) ++ : freq) < 0) { ++ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ ++ perror("ioctl"); ++ } ++ } ++ else ++ { ++ /* BEEP_TYPE_EVDEV */ ++ struct input_event e; ++ ++ e.type = EV_SND; ++ e.code = SND_TONE; ++ e.value = freq; ++ ++ write(console_fd, &e, sizeof(struct input_event)); ++ } ++} ++ + void play_beep(beep_parms_t parms) { + int i; /* loop counter */ + + /* try to snag the console */ +- if((console_fd = open("/dev/console", O_WRONLY)) == -1) { +- fprintf(stderr, "Could not open /dev/console for writing.\n"); ++ ++ if(console_device) ++ console_fd = open(console_device, O_WRONLY); ++ else ++ if((console_fd = open("/dev/input/event0", O_WRONLY)) == -1) ++ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) ++ console_fd = open("/dev/vc/0", O_WRONLY); ++ ++ if(console_fd == -1) { ++ fprintf(stderr, "Could not open %s for writing\n", ++ console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); + printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ + perror("open"); + exit(1); + } + ++ if (ioctl(console_fd, EVIOCGSND(0)) != -1) ++ console_type = BEEP_TYPE_EVDEV; ++ else ++ console_type = BEEP_TYPE_CONSOLE; ++ + /* Beep */ + for (i = 0; i < parms.reps; i++) { /* start beep */ +- if(ioctl(console_fd, KIOCSOUND, (int)(CLOCK_TICK_RATE/parms.freq)) < 0) { +- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ +- perror("ioctl"); +- } ++ do_beep(parms.freq); + /* Look ma, I'm not ansi C compatible! */ + usleep(1000*parms.length); /* wait... */ +- ioctl(console_fd, KIOCSOUND, 0); /* stop beep */ ++ do_beep(0); + if(parms.end_delay || (i+1 < parms.reps)) + usleep(1000*parms.delay); /* wait... */ + } /* repeat. */ +@@ -295,5 +345,8 @@ int main(int argc, char **argv) { + parms = next; + } + ++ if(console_device) ++ free(console_device); ++ + return EXIT_SUCCESS; + } diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.init b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.init index 95f5f73c6..83413463d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.init +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.init @@ -47,11 +47,11 @@ if [ -r /etc/default/$NAME ]; then . /etc/default/$NAME fi -if test "$ENABLE_COREFILES" == 1; then +if test "$ENABLE_COREFILES" = 1; then ulimit -c unlimited fi -if test "$USE_COLLECTDMON" == 1; then +if test "$USE_COLLECTDMON" = 1; then _PIDFILE="$COLLECTDMON_PIDFILE" else _PIDFILE="$PIDFILE" @@ -96,7 +96,7 @@ d_start() { return 2 fi - if test "$USE_COLLECTDMON" == 1; then + if test "$USE_COLLECTDMON" = 1; then start-stop-daemon --start --quiet --oknodo --pidfile "$_PIDFILE" \ --exec $COLLECTDMON_DAEMON -- -P "$_PIDFILE" -- -C "$CONFIGFILE" \ || return 2 @@ -150,7 +150,7 @@ d_stop() { # 0 if the daemon is running # 3 if the daemon is stopped d_status(){ - if test "$USE_COLLECTDMON" == 1; then + if test "$USE_COLLECTDMON" = 1; then status $COLLECTDMON_DAEMON else status $DAEMON diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb index b9e735f27..f84a91adf 100644 --- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb @@ -56,7 +56,7 @@ EXTRA_OECONF = " \ ${FPLAYOUT} \ --disable-perl --with-libperl=no --with-perl-bindings=no \ --with-libgcrypt=${STAGING_BINDIR_CROSS}/libgcrypt-config \ - --disable-notify_desktop \ + --disable-notify_desktop --disable-werror \ " do_install_append() { diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20200327.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20201126.bb index 4c3177c05..5097788ed 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20200327.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20201126.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ " -SRC_URI[md5sum] = "f7a3c240af305b5282af590541e8f4b7" -SRC_URI[sha256sum] = "466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99" +SRC_URI[md5sum] = "14bf3b33de348838ff30aff0aa9d1c2e" +SRC_URI[sha256sum] = "c9233a6c8ea33a59e2378e5146ae2bd13b519744cfdb647af7420adac5ad3866" # hardcoded here for use in dialog-static recipe S = "${WORKDIR}/dialog-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch new file mode 100644 index 000000000..75065eb05 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch @@ -0,0 +1,38 @@ +Upstream-status: Backport +CVE: CVE-2020-29394 +From 7f5cd5404a03fa330e192084f6bdafb2dc9bdcb7 Mon Sep 17 00:00:00 2001 +From: GwanYeong Kim <gy741.kim@gmail.com> +Date: Sat, 28 Nov 2020 12:24:46 +0900 +Subject: [PATCH] dlt_common: Fix buffer overflow in dlt_filter_load + +A buffer overflow in the dlt_filter_load function in dlt_common.c in dlt-daemon allows arbitrary code execution via an unsafe usage of fscanf, because it does not limit the number of characters to be read in a format argument. + +Fixed: #274 + +Signed-off-by: GwanYeong Kim <gy741.kim@gmail.com> +--- + src/shared/dlt_common.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c +index 254f4ce4..d15b1cec 100644 +--- a/src/shared/dlt_common.c ++++ b/src/shared/dlt_common.c +@@ -404,7 +404,7 @@ DltReturnValue dlt_filter_load(DltFilter *filter, const char *filename, int verb + while (!feof(handle)) { + str1[0] = 0; + +- if (fscanf(handle, "%s", str1) != 1) ++ if (fscanf(handle, "%254s", str1) != 1) + break; + + if (str1[0] == 0) +@@ -419,7 +419,7 @@ DltReturnValue dlt_filter_load(DltFilter *filter, const char *filename, int verb + + str1[0] = 0; + +- if (fscanf(handle, "%s", str1) != 1) ++ if (fscanf(handle, "%254s", str1) != 1) + break; + + if (str1[0] == 0) diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb index f3fcee4d2..5066e76d3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb @@ -19,6 +19,7 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \ file://0004-Modify-systemd-config-directory.patch \ file://241.patch \ file://245.patch \ + file://275.patch \ " SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2" diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb index 411268815..bc4cd0cf9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb @@ -26,6 +26,8 @@ DEPENDS_append_libc-musl = " fts " INSANE_SKIP_${PN}-dev += "dev-elf" +LTO = "" + # Use CMake 'Unix Makefiles' generator OECMAKE_GENERATOR ?= "Unix Makefiles" @@ -44,6 +46,7 @@ EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off -DFLB_EXAMPLES=Off " EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On','',d)}" EXTRA_OECMAKE_append_riscv64 = " -DFLB_DEPS='atomic'" +EXTRA_OECMAKE_append_riscv32 = " -DFLB_DEPS='atomic'" # Kafka Output plugin (disabled by default): note that when # enabling Kafka output plugin, the backend library librdkafka diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb index 926d8851d..b2c41756e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.8.bb @@ -32,7 +32,7 @@ BBCLASSEXTEND = "native" DEPENDS_class-native = "readline-native" PACKAGECONFIG_class-native = "" -SRC_URI_append_class-native = "file://0001-reduce-build-to-conversion-tools-for-native-build.patch" +SRC_URI_append_class-native = " file://0001-reduce-build-to-conversion-tools-for-native-build.patch" do_install_class-native() { install -d ${D}${bindir} diff --git a/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb b/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb new file mode 100644 index 000000000..68beec670 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb @@ -0,0 +1,12 @@ +SUMMARY = "inputattach configuration file" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI = "file://inputattach.conf" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + install -Dm 0644 ${WORKDIR}/inputattach.conf ${D}${sysconfdir}/inputattach.conf +} diff --git a/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config/inputattach.conf b/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config/inputattach.conf new file mode 100644 index 000000000..86c421012 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config/inputattach.conf @@ -0,0 +1,8 @@ +# +# Configuration for inputattach +# +# Every line of this file are inputattach arguments, see 'inputattach --help'. +# An inputattach instance will be started for each element. +# +# --microsoft /dev/ttyS0 +# --baud 9600 --w8001 /dev/ttyS1 diff --git a/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb b/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb index 50dd74b68..f2805a1b8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb @@ -2,10 +2,10 @@ SUMMARY = "A handy serial sniffer" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" -PV = "2.3.5+git${SRCPV}" +PV = "2.3.6+git${SRCPV}" SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=http" -SRCREV = "c2d857091c0dfed05139ac07ea9b0f36ad259638" +SRCREV = "bc1d4f6587a4a4829b5d55e3ca7ad584da6de545" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb index 408fa8ac0..6ef5b4f43 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ DEPENDS = "libxml2 glib-2.0 swig python3" -inherit autotools pkgconfig python3native +inherit autotools pkgconfig python3native python3targetconfig SRCREV = "c5a30e9267068436a75b5d00fcbf95cb9c1f4dcd" SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb index a081cb17a..27fe0e2c4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb @@ -31,4 +31,4 @@ FILES_statgrab-dbg = "${bindir}/.debug/statgrab" FILES_saidar = "${bindir}/saidar" FILES_saidar-dbg = "${bindir}/.debug/saidar" FILES_${PN}-mrtg = "${bindir}/statgrab-make-mrtg-config ${bindir}/statgrab-make-mrtg-index" -RDEPENDS_${PN}-mrtg_append = "perl statgrab" +RDEPENDS_${PN}-mrtg_append = " perl statgrab" diff --git a/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/51-these-are-not-joysticks-rm.rules b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/51-these-are-not-joysticks-rm.rules new file mode 100644 index 000000000..3e0ab4018 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/51-these-are-not-joysticks-rm.rules @@ -0,0 +1,83 @@ +# /etc/udev/rules.d/51-these-are-not-joysticks-rm.rules +# +# This file is auto-generated. For more information: +# https://github.com/denilsonsa/udev-joystick-blacklist + +SUBSYSTEM=="input", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c30a", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c30a", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="04d9", ATTRS{idProduct}=="a0df", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="04d9", ATTRS{idProduct}=="a0df", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0010", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0010", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0011", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0011", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0012", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0012", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0013", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0013", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0014", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0014", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0015", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0015", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0016", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0016", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0017", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0017", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0018", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0018", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0019", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0019", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00d1", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00d1", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="030e", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="030e", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="054f", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="054f", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="1410", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="1410", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="3043", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="3043", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="31b5", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="31b5", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="3997", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="3997", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="3f8b", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="3f8b", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="51f4", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="51f4", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="5589", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="5589", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="7b22", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="7b22", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="7f2d", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="7f2d", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="8090", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="8090", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="9033", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="9033", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="9066", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="9066", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="9090", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="9090", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="90c0", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="90c0", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="f012", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="f012", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="f32a", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="f32a", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="f613", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="f613", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="f624", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="f624", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="1b1c", ATTRS{idProduct}=="1b3c", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="1b1c", ATTRS{idProduct}=="1b3c", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="1d57", ATTRS{idProduct}=="ad03", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="1d57", ATTRS{idProduct}=="ad03", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="1e7d", ATTRS{idProduct}=="2e4a", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="1e7d", ATTRS{idProduct}=="2e4a", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="422d", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="422d", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="2516", ATTRS{idProduct}=="001f", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="2516", ATTRS{idProduct}=="001f", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="2516", ATTRS{idProduct}=="0028", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="2516", ATTRS{idProduct}=="0028", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" diff --git a/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/60-joystick.rules b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/60-joystick.rules new file mode 100644 index 000000000..24b009be2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/60-joystick.rules @@ -0,0 +1,7 @@ +# Restore any stored calibration for the device +ACTION=="add", KERNEL=="js*", RUN+="/usr/bin/jscal-restore %E{DEVNAME}" + +# Set PS3 controller leds to the same value bluez will choose for it. +# IMPORT{parent} used because $parent did not appear to be working; we +# don't need the devpath of the js device for this so it is OK to overwrite. +ACTION=="add", KERNEL=="js*", IMPORT{parent}="DEVPATH", ATTRS{name}=="Sony PLAYSTATION(R)3 Controller", RUN+="/lib/udev/js-set-enum-leds /sys/%E{DEVPATH}/device/leds/ $number" diff --git a/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/inputattach.service b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/inputattach.service new file mode 100644 index 000000000..2ec902c09 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/inputattach.service @@ -0,0 +1,11 @@ +[Unit] +Description=Attach serial input devices to kernel input subsystem +After=syslog.target + +[Service] +Type=forking +ExecStart=/usr/bin/inputattachctl start +ExecStop=/usr/bin/inputattachctl stop + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/inputattachctl b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/inputattachctl new file mode 100644 index 000000000..c6da4e68f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole/inputattachctl @@ -0,0 +1,16 @@ +#!/bin/sh + +do_start() { + grep -v '^#' /etc/inputattach.conf | while read -r line; do + inputattach --daemon $line || exit 1 + done +} + +case "$1" in + start) + do_start + ;; + stop) + killall -9 inputattach || true + ;; +esac diff --git a/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb new file mode 100644 index 000000000..c4cd1d609 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb @@ -0,0 +1,83 @@ +SUMMARY = "Linux Console Project" +DESCRIPTION = "This project maintains the Linux Console tools, which include \ +utilities to test and configure joysticks, connect legacy devices to the kernel's \ +input subsystem (providing support for serial mice, touchscreens etc.), and test \ +the input event layer." +HOMEPAGE = "https://sourceforge.net/projects/linuxconsole" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libsdl2" +DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/linuxconsole/linuxconsoletools-${PV}.tar.bz2 \ + file://51-these-are-not-joysticks-rm.rules \ + file://60-joystick.rules \ + file://inputattachctl \ + file://inputattach.service \ +" + +SRC_URI[sha256sum] = "95d112f06393806116341d593bda002c8bc44119c1538407623268fed90d8c34" + +S = "${WORKDIR}/linuxconsoletools-${PV}" + +inherit systemd pkgconfig + +EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} -C utils" +EXTRA_OEMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'SYSTEMD_SUPPORT=1', '', d)}" + +SYSTEMD_PACKAGES += "inputattach" +SYSTEMD_SERVICE_inputattach = "inputattach.service" +SYSTEMD_AUTO_ENABLE_inputattach = "enable" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install + + install -Dm 0644 ${WORKDIR}/51-these-are-not-joysticks-rm.rules ${D}${base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules + install -Dm 0644 ${WORKDIR}/60-joystick.rules ${D}${base_libdir}/udev/rules.d/60-joystick.rules + + install -Dm 0644 ${WORKDIR}/inputattach.service ${D}${systemd_system_unitdir}/inputattach.service + install -Dm 0755 ${WORKDIR}/inputattachctl ${D}${bindir}/inputattachctl +} + +PACKAGES += "inputattach joystick" + +# We won't package any file here as we are following the same packaging schema +# Debian does and we are splitting it in 'inputattach' and 'joystick' packages. +FILES_${PN} = "" + +FILES_inputattach += "\ + ${bindir}/inputattach \ + ${bindir}/inputattachctl \ + ${systemd_system_unitdir}/inputattach.service \ +" + +FILES_joystick += "\ + ${bindir}/evdev-joystick \ + ${bindir}/ffcfstress \ + ${bindir}/ffmvforce \ + ${bindir}/ffset \ + ${bindir}/fftest \ + ${bindir}/jscal \ + ${bindir}/jscal-restore \ + ${bindir}/jscal-store \ + ${bindir}/jstest \ + ${datadir}/joystick \ + ${base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules \ + ${base_libdir}/udev/js-set-enum-leds \ + ${base_libdir}/udev/rules.d/60-joystick.rules \ + ${base_libdir}/udev/rules.d/80-stelladaptor-joystick.rules \ +" + +RDEPENDS_inputattach += "inputattach-config" + +RDEPENDS_joystick += "\ + bash \ + gawk \ +" diff --git a/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.18.bb b/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.18.bb index c76e0f69e..a82f10b91 100644 --- a/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.18.bb +++ b/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.18.bb @@ -8,7 +8,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" DEPENDS = "liblockfile" -SRC_URI = "http://ftp.de.debian.org/debian/pool/main/l/${BPN}/${BPN}_${PV}.tar.gz" +SRC_URI = "${DEBIAN_MIRROR}/main/l/${BPN}/${BPN}_${PV}.tar.gz" SRC_URI[md5sum] = "4eb83bdf88016db836b7cc09591fb0f3" SRC_URI[sha256sum] = "a42995a4b97e6188efc90fcc1a761163c4b2cff5c81b936f85c84301ddb05ce6" diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-civetweb-CMakeLists.txt-do-not-search-gcc-ar-and-gcc.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-civetweb-CMakeLists.txt-do-not-search-gcc-ar-and-gcc.patch new file mode 100644 index 000000000..bc480d969 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-civetweb-CMakeLists.txt-do-not-search-gcc-ar-and-gcc.patch @@ -0,0 +1,34 @@ +From 0eee3fb85dad084b6b42f7b219d8aa3a62620a27 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 28 Oct 2020 09:52:40 +0800 +Subject: [PATCH] civetweb/CMakeLists.txt: do not search gcc-ar and gcc-ranlib + +Do not search gcc-ar and gcc-ranlib. Specify GCC_AR and GCC_RANLIB in +EXTRA_OECMAKE to avoid host contamination. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + thirdparty/civetweb-1.10/CMakeLists.txt | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/thirdparty/civetweb-1.10/CMakeLists.txt b/thirdparty/civetweb-1.10/CMakeLists.txt +index f559a04e..0689e3f6 100644 +--- a/thirdparty/civetweb-1.10/CMakeLists.txt ++++ b/thirdparty/civetweb-1.10/CMakeLists.txt +@@ -246,11 +246,9 @@ set_property(CACHE CIVETWEB_CXX_STANDARD PROPERTY STRINGS auto c++14 c++11 c++98 + + # Configure the linker + if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") +- find_program(GCC_AR gcc-ar) + if (GCC_AR) + set(CMAKE_AR ${GCC_AR}) + endif() +- find_program(GCC_RANLIB gcc-ranlib) + if (GCC_RANLIB) + set(CMAKE_RANLIB ${GCC_RANLIB}) + endif() +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index 9113fa67a..b3ea44c3c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -7,7 +7,7 @@ SECTION = "console/network" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=f9534eb5f4ab800b573a37bffc62f3a7" -DEPENDS = "virtual/crypt expat flex python3 bison-native libxml2" +DEPENDS = "virtual/crypt expat flex python3 bison-native libxml2 nettle lz4" RDEPENDS_${PN} = "python3-core" SRCREV = "aa42957a2e227df41510047cece3cd606dc1cb6a" @@ -27,6 +27,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git \ file://0001-CMakeLists.txt-use-curl-local-source-tarball.patch \ file://0002-cmake-LibreSSL.cmake-use-libressl-local-source-tarba.patch \ file://0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch \ + file://0001-civetweb-CMakeLists.txt-do-not-search-gcc-ar-and-gcc.patch \ file://minifi.service \ file://systemd-volatile.conf \ file://sysvinit-volatile.conf \ @@ -52,20 +53,26 @@ OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" EXTRA_OECMAKE += " \ -DHOST_SYS=${HOST_SYS} -DBUILD_SYS=${BUILD_SYS} \ -DSKIP_TESTS=ON \ + -DGCC_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \ + -DGCC_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ " EXTRA_OECMAKE_append_toolchain-clang = " -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib" LDFLAGS_append_toolchain-clang = " -fuse-ld=lld" + +# RV lld errors out: +# riscv64-yoe-linux-ld.lld: error: init.c:(.text+0x0): relocation R_RISCV_ALIGN requires unimplemented linker relaxation; recompile with -mno-relax LDFLAGS_remove_riscv32 = "-fuse-ld=lld" +LDFLAGS_remove_riscv64 = "-fuse-ld=lld" # There are endian issues when communicating with the x86 nifi on the the mips and the ppc machines. COMPATIBLE_MACHINE_mips = "(!.*mips).*" COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" COMPATIBLE_MACHINE_powerpc = "(!.*ppc).*" -TARGET_CFLAGS_append_riscv32 += "-fpic" -TARGET_CXXFLAGS_append_riscv32 += "-fpic" -TARGET_CFLAGS_append_riscv64 += "-fpic" -TARGET_CXXFLAGS_append_riscv64 += "-fpic" +TARGET_CFLAGS_append_riscv32 = " -fpic" +TARGET_CXXFLAGS_append_riscv32 = " -fpic" +TARGET_CFLAGS_append_riscv64 = " -fpic" +TARGET_CXXFLAGS_append_riscv64 = " -fpic" do_install[cleandirs] += "${WORKDIR}/minifi-install" diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb index 8bd8e9006..9b3289f17 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -5,8 +5,8 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=91e7de50a8d3cf01057f318d72460acd" -SRCREV = "e15ce6fbc76148ba8835adc92196b0d0a3f245e7" -PV = "2.1.0+git${SRCPV}" +SRCREV = "7786c7ded5c9ce7773890d0e3dc27632898fc6b1" +PV = "2.2.0+git${SRCPV}" SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \ file://0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.6.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.8.bb index 1e22d3abe..4f0f719fb 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.8.bb @@ -25,7 +25,7 @@ SRC_URI = " \ gitsm://github.com/ostreedev/ostree \ file://run-ptest \ " -SRCREV = "5d2183f63ef5ecf0e6e555c3214dd3fc17a8e5a1" +SRCREV = "3e289b19345e30d2da193cd208e109f7d7aaa2a1" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.1.2.bb b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.1.bb index e23733b0f..4059fd47e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.1.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.1.bb @@ -7,7 +7,7 @@ RDEPENDS_${PN} += "hiredis" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "b08b36a9a91de00636e583307610f49af7876f50" +SRCREV = "a9f9c301f8de1c181e6d45c573b5d1fe7b8200b1" SRC_URI = "git://github.com/sewenew/redis-plus-plus" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/ilp32.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/ilp32.patch new file mode 100644 index 000000000..48d01a1d6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/ilp32.patch @@ -0,0 +1,29 @@ +__ILP32__ is defined for all 32bit architectures with clang e.g. +which is right but it is causing issues on non-x86 architectures +where this condition becomes true and wrongly starts using this +code, this issue is hidden with gcc becuase gcc does not define +__ILP32__ for all 32bit architectures but for selected 64bit arches +who choose to use 32bit ABI e.g. x32 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/debug.c ++++ b/src/debug.c +@@ -944,7 +944,7 @@ static void *getMcontextEip(ucontext_t * + /* Linux */ + #if defined(__riscv) && __riscv_xlen == 32 + return (void*) uc->uc_mcontext.__gregs[REG_PC]; +- #elif defined(__i386__) || defined(__ILP32__) ++ #elif defined(__i386__) || (defined(__X86_64__) && defined(__ILP32__)) + return (void*) uc->uc_mcontext.gregs[14]; /* Linux 32 */ + #elif defined(__X86_64__) || defined(__x86_64__) + return (void*) uc->uc_mcontext.gregs[16]; /* Linux 64 */ +@@ -1125,7 +1125,7 @@ void logRegisters(ucontext_t *uc) { + ); + logStackContent((void**)uc->uc_mcontext.__gregs[REG_SP]); + /* Linux x86 */ +- #elif defined(__i386__) || defined(__ILP32__) ++ #elif defined(__i386__) || ( defined(__X86_64__) && defined(__ILP32__)) + serverLog(LL_WARNING, + "\n" + "EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb index 546332851..14091b565 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb @@ -16,6 +16,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://0001-src-Do-not-reset-FINAL_LIBS.patch \ file://GNU_SOURCE.patch \ file://riscv32.patch \ + file://ilp32.patch \ " SRC_URI[md5sum] = "70113b4b8ea7ee4c7e148be62b5d1e0b" diff --git a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/python39.patch b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/python39.patch new file mode 100644 index 000000000..f7115a1cb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/python39.patch @@ -0,0 +1,27 @@ +From 9b0ad5177bd692f7556a4756bdbd2da81d9c34ce Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz> +Date: Tue, 4 Aug 2020 09:19:44 +0200 +Subject: [PATCH] configure.ac: Add support for Python 3.9. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index f9958b3..2917cb3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) + # first, since usually only that variant will add "-lpython3.8". + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + SR_PKG_CHECK([python3], [SRD_PKGLIBS], +- [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) + AS_IF([test "x$sr_have_python3" = xno], + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) + +-- +2.24.0.rc2 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb index f9c1d1a3a..d78d2770c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb @@ -8,7 +8,8 @@ DEPENDS = "glib-2.0 python3" inherit autotools pkgconfig -SRC_URI = "http://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-${PV}.tar.gz" +SRC_URI = "http://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-${PV}.tar.gz \ + file://python39.patch" SRC_URI[md5sum] = "7ba4ed4ef1f06ae96979751e096c2821" SRC_URI[sha256sum] = "c50814aa6743cd8c4e88c84a0cdd8889d883c3be122289be90c63d7d67883fc0" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb index e3ad04f59..b44942303 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -6,14 +6,15 @@ DEPENDS = "libsocketcan" SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git" -SRCREV = "da65fdfe0d1986625ee00af0b56ae17ec132e700" +SRCREV = "856d0a662a02dd2dc0b83a7ad1de9fd120e82c4b" -PV = "2020.02.04" +PV = "2020.11.0" S = "${WORKDIR}/git" inherit autotools pkgconfig update-alternatives -ALTERNATIVE_${PN} = "candump cansend" +ALTERNATIVE_${PN} = "candump cansend cansequence" ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump" ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend" +ALTERNATIVE_LINK_NAME[cansequence] = "${bindir}/cansequence" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb index aaa265348..8b13daea1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb @@ -22,6 +22,7 @@ inherit autotools pkgconfig RDEPENDS_${PN} += "iproute2" ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_${PN} = "candump cansend" +ALTERNATIVE_${PN} = "candump cansend cansequence" ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump" ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend" +ALTERNATIVE_LINK_NAME[cansequence] = "${bindir}/cansequence" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.11.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb index 0debe47e0..b7a7f6f47 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.11.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb @@ -5,10 +5,14 @@ SECTION = "libs/network" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38adced4385d8fba1ae2437cedee1" -SRCREV = "0ff01ae7e4d271a7b81241e7a7026bfcea0add3f" +SRCREV = "077def398ad303043d73339112968e5112d8d7c8" SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git" S = "${WORKDIR}/git" inherit autotools pkgconfig + +PACKAGECONFIG ?= "" +PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" +PACKAGECONFIG[no-error-log] = "--disable-error-log,--enable-error-log" diff --git a/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.1b.bb b/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.1c.bb index f5078e923..7cac48eb6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.1b.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.1c.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=f256b76d52e7b4d02bf DEPENDS = "ncurses libevent" SRC_URI = "https://github.com/tmux/tmux/releases/download/${PV}/tmux-${PV}.tar.gz" -SRC_URI[md5sum] = "2cdacbf06ac4980d3f5312ad23b37f9b" -SRC_URI[sha256sum] = "d93f351d50af05a75fe6681085670c786d9504a5da2608e481c47cf5e1486db9" +SRC_URI[md5sum] = "7301d3fa12f35051edb185496766c745" +SRC_URI[sha256sum] = "918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386" UPSTREAM_CHECK_URI = "https://github.com/tmux/tmux/releases" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb index 9d1bb7d04..4ae13e7ef 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb @@ -13,4 +13,7 @@ SRC_URI[archive.md5sum] = "656548dc431004d1ebf95e5d0bb4b9c8" SRC_URI[archive.sha256sum] = "abff194c7c4802fba2e233890d09dde8bf7170c3ad5e13000601c8d5b3c44717" export ac_cv_have_iconv_detect_h="yes" -do_configure_append = "cp ${WORKDIR}/iconv-detect.h ${S}" + +do_configure_append () { + cp ${WORKDIR}/iconv-detect.h ${S} +} diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.3.bb b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.4.bb index 7ef2e5305..9f4a7636d 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.3.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.4.bb @@ -11,7 +11,7 @@ SRC_URI = "\ git://github.com/hughsie/libjcat.git \ file://run-ptest \ " -SRCREV = "3c120a9132a36b100366cfe3d658ae31e6f4b7e9" +SRCREV = "55872cea013755a170a581333077b23e322f388b" S = "${WORKDIR}/git" inherit gobject-introspection gtk-doc meson ptest-gnome vala diff --git a/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc index f7dc66843..e11f7a60f 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc @@ -22,6 +22,7 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g file://fix-client-gfx_state-initialisation.patch \ file://fix-tslib-version-check.patch \ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ + file://0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch \ " S = "${WORKDIR}/DirectFB-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch new file mode 100644 index 000000000..db4417a3d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch @@ -0,0 +1,54 @@ +From 7df69c3a784ab2cc4770bdb366cf788cdb78099a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Nov 2020 12:30:41 -0800 +Subject: [PATCH] os/linux: Fix build when __NR_futex is not available + +Newer architectures like riscv32 do not define __NR_futex intentionally +since it uses 64bit time_t from very beginning, therefore only caters to +futex_time64 syscall + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/direct/os/linux/glibc/system.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/lib/direct/os/linux/glibc/system.c b/lib/direct/os/linux/glibc/system.c +index 373a711..d027a70 100644 +--- a/lib/direct/os/linux/glibc/system.c ++++ b/lib/direct/os/linux/glibc/system.c +@@ -36,6 +36,7 @@ + + #include <errno.h> + #include <signal.h> ++#include <sys/syscall.h> + #include <unistd.h> + + #include <linux/unistd.h> +@@ -46,6 +47,10 @@ + #include <direct/system.h> + #include <direct/util.h> + ++#if !defined(SYS_futex) && defined(SYS_futex_time64) ++# define SYS_futex SYS_futex_time64 ++#endif ++ + D_LOG_DOMAIN( Direct_Futex, "Direct/Futex", "Direct Futex" ); + D_LOG_DOMAIN( Direct_Trap, "Direct/Trap", "Direct Trap" ); + +@@ -239,10 +244,9 @@ direct_futex( int *uaddr, int op, int val, const struct timespec *timeout, int * + } + #endif + +- ret = syscall( __NR_futex, uaddr, op, val, timeout, uaddr2, val3 ); ++ ret = syscall( SYS_futex, uaddr, op, val, timeout, uaddr2, val3 ); + if (ret < 0) + return errno2result( errno ); + + return DR_OK; + } +- +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.3.bb b/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.4.bb index e3dff9191..a1294b98a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.4.bb @@ -6,7 +6,7 @@ SECTION = "console/utils" DEPENDS = "libpng zlib" SRC_URI = "git://github.com/GunnarMonell/fbgrab.git;protocol=https" -SRCREV = "b179e2a42b8a5d72516b9c8d91713c9025cf6044" +SRCREV = "74373aafc0b496e67642562d86eac6b858a31f24" S = "${WORKDIR}/git" inherit autotools-brokensep diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch index 21bf1bcd5..6d1d441c5 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/configure.ac +++ b/configure.ac -@@ -1676,7 +1676,7 @@ AC_ARG_ENABLE(tcl, +@@ -1540,7 +1540,7 @@ AC_ARG_ENABLE(tcl, [], [enable_tcl=yes]) if test "x$enable_tcl" != "xyes"; then diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch index eb51d03d2..76ff08f63 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch @@ -13,12 +13,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> lib/gvpr/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/lib/gvpr/Makefile.am b/lib/gvpr/Makefile.am -index ac3c098..4914854 100644 --- a/lib/gvpr/Makefile.am +++ b/lib/gvpr/Makefile.am -@@ -57,7 +57,7 @@ endif - mkdefs_SOURCES = mkdefs.c +@@ -59,7 +59,7 @@ mkdefs$(EXEEXT): + $(HOSTCC) $(srcdir)/mkdefs.c -o mkdefs$(EXEEXT) gdefs.h: $(top_srcdir)/lib/gvpr/gprdata mkdefs$(EXEEXT) - ./mkdefs$(EXEEXT) gdefs.h < $(top_srcdir)/lib/gvpr/gprdata @@ -26,6 +24,3 @@ index ac3c098..4914854 100644 EXTRA_DIST = $(man_MANS) $(pdf_DATA) gprdata mkdefs.c gdefs.h trie.c gvprlib.vcxproj* --- -2.20.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch index a9b035243..dd7951056 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch @@ -18,8 +18,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> plugin/pango/gvtextlayout_pango.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c -index d620b29..b0da11c 100644 --- a/plugin/pango/gvtextlayout_pango.c +++ b/plugin/pango/gvtextlayout_pango.c @@ -15,6 +15,10 @@ @@ -33,6 +31,3 @@ index d620b29..b0da11c 100644 #include "gvplugin_render.h" #include "agxbuf.h" #include "utils.h" --- -2.22.0 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb index aa5c0c820..bc46a11d3 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb @@ -26,7 +26,8 @@ inherit autotools-brokensep pkgconfig gettext # get checksum errors. Fedora people seem to expect same so they use a versioned # source - see https://src.fedoraproject.org/cgit/rpms/graphviz.git/tree/graphviz.spec -SRC_URI = "https://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PV}/graphviz-stable_release_${PV}.tar.gz \ +SRCREV = "771bc4dbff3e6f358fa75cdc7774a413ccacad51" +SRC_URI = "https://www2.graphviz.org/Packages/stable/portable_source/${BP}.tar.gz \ file://0001-plugin-pango-Include-freetype-headers-explicitly.patch \ " # Use native mkdefs @@ -38,10 +39,9 @@ SRC_URI_append_class-nativesdk = "\ file://0001-Use-native-mkdefs.patch \ file://graphviz-setup.sh \ " -SRC_URI[md5sum] = "2acf30ca8e6cc8b001b0334db65fd072" -SRC_URI[sha256sum] = "e6c3f8dbfde1c4523055403927bef29f97f9fc12715c1042b5dcf648a2c1c62a" +SRC_URI[sha256sum] = "8e1b34763254935243ccdb83c6ce108f531876d7a5dfd443f255e6418b8ea313" -S = "${WORKDIR}/${BPN}-stable_release_${PV}" +EXTRA_OECONF_append = " PS2PDF=/bin/echo" EXTRA_OECONF_class-target = "\ --with-expatincludedir=${STAGING_INCDIR} \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.22.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.23.bb index b2b053a28..2abd11a4c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.22.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.23.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb" SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https" -SRCREV = "95b2f0583a71c92cddefb54b522efe717b7a5adc" +SRCREV = "cc02d63dde901e06d1f866984fd0e80601deaa13" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb index ba94a838a..15c40ee31 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb @@ -21,7 +21,7 @@ DEPENDS += "boost libyui ncurses" BBCLASSEXTEND = "nativesdk" EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" -EXTRA_OECMAKE_append_toolchain-clang = "-DENABLE_WERROR=OFF" +EXTRA_OECMAKE_append_toolchain-clang = " -DENABLE_WERROR=OFF" do_configure_prepend () { cd ${S} diff --git a/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-tools_git.bb b/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-tools_git.bb deleted file mode 100644 index 8e8388e8d..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-tools_git.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "The SPIR-V Tools project provides an API and commands for \ -processing SPIR-V modules" -DESCRIPTION = "The project includes an assembler, binary module parser, \ -disassembler, validator, and optimizer for SPIR-V." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SECTION = "graphics" - -S = "${WORKDIR}/git" -DEST_DIR = "${S}/external" -SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;name=spirv-tools \ - git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \ - git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \ - git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \ - git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \ - file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch \ - file://0001-Avoid-pessimizing-std-move-3124.patch \ -" -SRCREV_spirv-tools = "c413b982c316b14e784f50d941814fc737b55b4a" -SRCREV_spirv-headers = "af64a9e826bf5bb5fcd2434dd71be1e41e922563" -SRCREV_effcee = "cd25ec17e9382f99a895b9ef53ff3c277464d07d" -SRCREV_re2 = "5bd613749fd530b576b890283bfb6bc6ea6246cb" -SRCREV_googletest = "f2fb48c3b3d79a75a88a99fba6576b25d42ec528" - -inherit cmake python3native - -EXTRA_OECMAKE += "-DSPIRV_WERROR=OFF" - -do_install_append() { - install -d ${D}/${includedir}/spirv - install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/1.2/* ${D}/${includedir}/spirv -} - -FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/*.so" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb index 5e0076b20..801bd05c9 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb @@ -27,3 +27,5 @@ do_install() { } SECURITY_CFLAGS_riscv64 = "${SECURITY_NOPIE_CFLAGS}" +LTO = "" + diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-an-ARM64-gcc-10-compilation-error.-Without-t.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-an-ARM64-gcc-10-compilation-error.-Without-t.patch deleted file mode 100644 index c94644438..000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-an-ARM64-gcc-10-compilation-error.-Without-t.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0dddb4e1158705345b7f4f71635d42c89e1b0c8f Mon Sep 17 00:00:00 2001 -From: Dave Anderson <anderson@redhat.com> -Date: Fri, 31 Jan 2020 17:11:46 -0500 -Subject: [PATCH] Fix for an ARM64 gcc-10 compilation error. Without the - patch, the build of the embedded gdb module fails with an error message that - indicates "multiple definition of 'tdesc_aarch64'". (anderson@redhat.com) - -Upstream-Status: Backport [https://github.com/crash-utility/crash/commit/e770735200c02ac2414c394ea6ec5f7f033efe64] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gdb-7.6.patch | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - -diff --git a/gdb-7.6.patch b/gdb-7.6.patch -index f6c311d..f64b55f 100644 ---- a/gdb-7.6.patch -+++ b/gdb-7.6.patch -@@ -2471,3 +2471,33 @@ diff -up gdb-7.6/opcodes/configure.orig gdb-7.6/opcodes/configure - #else - # error "!__i386__ && !__x86_64__" - #endif -+--- gdb-7.6/gdb/features/aarch64.c.orig -++++ gdb-7.6/gdb/features/aarch64.c -+@@ -5,7 +5,6 @@ -+ #include "osabi.h" -+ #include "target-descriptions.h" -+ -+-struct target_desc *tdesc_aarch64; -+ static void -+ initialize_tdesc_aarch64 (void) -+ { -+--- gdb-7.6/gdb/aarch64-linux-nat.c.orig -++++ gdb-7.6/gdb/aarch64-linux-nat.c -+@@ -37,6 +37,7 @@ -+ -+ #include "gregset.h" -+ -++extern struct target_desc *tdesc_aarch64; -+ #include "features/aarch64.c" -+ -+ /* Defines ps_err_e, struct ps_prochandle. */ -+--- gdb-7.6/gdb/aarch64-tdep.c.orig -++++ gdb-7.6/gdb/aarch64-tdep.c -+@@ -52,6 +52,7 @@ -+ #include "gdb_assert.h" -+ #include "vec.h" -+ -++struct target_desc *tdesc_aarch64; -+ #include "features/aarch64.c" -+ #include "features/aarch64-without-fpu.c" -+ --- -2.28.0 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.8.bb b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.9.bb index 6e2533635..4394b6fc6 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.8.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.9.bb @@ -25,9 +25,8 @@ SRC_URI = "git://github.com/crash-utility/${BPN}.git \ file://remove-unrecognized-gcc-option-m32-for-mips.patch \ file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ - file://0001-Fix-for-an-ARM64-gcc-10-compilation-error.-Without-t.patch \ " -SRCREV = "24f4801f8c8871a2e3e660fe9fa8fdd86bb29876" +SRCREV = "a25aa4b649d339dd25c20d5413d81b851a77e0b2" SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" diff --git a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 2b5ebcc27..7c36dfc60 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -27,6 +27,10 @@ PACKAGECONFIG_remove_arm = "bpf vm" # vm tests need libhugetlbfs starting 5.8+ (https://lkml.org/lkml/2020/4/22/1654) PACKAGECONFIG_remove_qemumips = "bpf vm" +# riscv does not support libhugetlbfs yet +PACKAGECONFIG_remove_riscv64 = "vm" +PACKAGECONFIG_remove_riscv32 = "vm" + PACKAGECONFIG[bpf] = ",,elfutils libcap libcap-ng rsync-native," PACKAGECONFIG[firmware] = ",,libcap, bash" PACKAGECONFIG[vm] = ",,libcap libhugetlbfs,libgcc bash" diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch deleted file mode 100644 index 49777bcee..000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 399f2c9a3acd5bd913e50a4dde52dee6527b297e Mon Sep 17 00:00:00 2001 -From: Kairui Song <kasong@redhat.com> -Date: Wed, 29 Jan 2020 13:37:13 +0800 -Subject: [PATCH] [PATCH] Remove duplicated variable definitions - -When building on Fedora 32 (with GCC 10), following error is observed: - -/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:2010: multiple definition of - `crash_reserved_mem_nr'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:2010: first defined here -/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:2009: multiple definition of - `crash_reserved_mem'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:2009: first defined here -/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:1278: multiple definition of - `parallel_info_t'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:1278: first defined here -/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:1265: multiple definition of - `splitting_info_t'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:1265: first defined here -... -collect2: error: ld returned 1 exit status -make: *** [Makefile:97: makedumpfile] Error 1 - -These variables are wrongly defined multiple times. So remove the -duplicated definitions. - -Upstream-Status: Backport [https://github.com/kraj/makedumpfile/commit/399f2c9a3acd5bd913e50a4dde52dee6527b297e] -Signed-off-by: Kairui Song <kasong@redhat.com> -Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com> ---- - makedumpfile.c | 8 ++++---- - makedumpfile.h | 8 ++++---- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/makedumpfile.c b/makedumpfile.c -index e290fbd..ae7336a 100644 ---- a/makedumpfile.c -+++ b/makedumpfile.c -@@ -10954,7 +10954,7 @@ check_param_for_reassembling_dumpfile(int argc, char *argv[]) - return FALSE; - - if ((info->splitting_info -- = malloc(sizeof(splitting_info_t) * info->num_dumpfile)) -+ = malloc(sizeof(struct splitting_info) * info->num_dumpfile)) - == NULL) { - MSG("Can't allocate memory for splitting_info.\n"); - return FALSE; -@@ -11042,7 +11042,7 @@ check_param_for_creating_dumpfile(int argc, char *argv[]) - return FALSE; - } - if ((info->splitting_info -- = malloc(sizeof(splitting_info_t) * info->num_dumpfile)) -+ = malloc(sizeof(struct splitting_info) * info->num_dumpfile)) - == NULL) { - MSG("Can't allocate memory for splitting_info.\n"); - return FALSE; -@@ -11077,13 +11077,13 @@ check_param_for_creating_dumpfile(int argc, char *argv[]) - - if (info->num_threads) { - if ((info->parallel_info = -- malloc(sizeof(parallel_info_t) * info->num_threads)) -+ malloc(sizeof(struct parallel_info) * info->num_threads)) - == NULL) { - MSG("Can't allocate memory for parallel_info.\n"); - return FALSE; - } - -- memset(info->parallel_info, 0, sizeof(parallel_info_t) -+ memset(info->parallel_info, 0, sizeof(struct parallel_info) - * info->num_threads); - } - -diff --git a/makedumpfile.h b/makedumpfile.h -index 68d9691..7217407 100644 ---- a/makedumpfile.h -+++ b/makedumpfile.h -@@ -1262,7 +1262,7 @@ struct splitting_info { - mdf_pfn_t end_pfn; - off_t offset_eraseinfo; - unsigned long size_eraseinfo; --} splitting_info_t; -+}; - - struct parallel_info { - int fd_memory; -@@ -1275,7 +1275,7 @@ struct parallel_info { - #ifdef USELZO - lzo_bytep wrkmem; - #endif --} parallel_info_t; -+}; - - struct ppc64_vmemmap { - unsigned long phys; -@@ -2006,8 +2006,8 @@ struct memory_range { - }; - - #define CRASH_RESERVED_MEM_NR 8 --struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR]; --int crash_reserved_mem_nr; -+extern struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR]; -+extern int crash_reserved_mem_nr; - - unsigned long read_vmcoreinfo_symbol(char *str_symbol); - int readmem(int type_addr, unsigned long long addr, void *bufptr, size_t size); --- -2.28.0 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch index ff093a72b..270cc3562 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch @@ -17,10 +17,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Makefile | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) -diff --git a/Makefile b/Makefile -index 1fdb628..5dce589 100644 ---- a/Makefile -+++ b/Makefile +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile @@ -8,12 +8,6 @@ ifeq ($(strip $CC),) CC = gcc endif @@ -81,12 +81,12 @@ index 1fdb628..5dce589 100644 SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) -@@ -52,17 +53,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) +@@ -52,12 +53,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) LIBS = -ldw -lbz2 -ldl -lelf -lz ifneq ($(LINKTYPE), dynamic) --LIBS := -static $(LIBS) -+LIBS := $(LIBS) +-LIBS := -static $(LIBS) -llzma ++LIBS := $(LIBS) -llzma endif ifeq ($(USELZO), on) @@ -96,13 +96,16 @@ index 1fdb628..5dce589 100644 endif ifeq ($(USESNAPPY), on) - LIBS := -lsnappy $(LIBS) +@@ -65,7 +66,7 @@ LIBS := -lsnappy $(LIBS) + ifneq ($(LINKTYPE), dynamic) + LIBS := $(LIBS) -lstdc++ + endif -CFLAGS += -DUSESNAPPY +CFLAGS_COMMON += -DUSESNAPPY endif LIBS := -lpthread $(LIBS) -@@ -87,14 +88,14 @@ LIBS := $(LIBS) $(call try-run,\ +@@ -90,14 +91,14 @@ LIBS := $(LIBS) $(call try-run,\ all: makedumpfile $(OBJ_PART): $(SRC_PART) @@ -119,7 +122,7 @@ index 1fdb628..5dce589 100644 echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8 grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8 mv temp.8 makedumpfile.8 -@@ -105,7 +106,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) +@@ -108,7 +109,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $( gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz eppic_makedumpfile.so: extension_eppic.c @@ -128,6 +131,3 @@ index 1fdb628..5dce589 100644 clean: rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch index 1707df3e3..85d883365 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch @@ -28,11 +28,11 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> arch/ppc64.c | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) -diff --git a/arch/ppc64.c b/arch/ppc64.c -index 9d8f252..6f4860f 100644 ---- a/arch/ppc64.c -+++ b/arch/ppc64.c -@@ -462,48 +462,14 @@ ppc64_vtop_level4(unsigned long vaddr) +Index: git/arch/ppc64.c +=================================================================== +--- git.orig/arch/ppc64.c ++++ git/arch/ppc64.c +@@ -462,44 +462,6 @@ ppc64_vtop_level4(unsigned long vaddr) return paddr; } @@ -40,6 +40,13 @@ index 9d8f252..6f4860f 100644 -set_ppc64_max_physmem_bits(void) -{ - long array_len = ARRAY_LENGTH(mem_section); +- +- /* Check if we can get MAX_PHYSMEM_BITS from vmcoreinfo */ +- if (NUMBER(MAX_PHYSMEM_BITS) != NOT_FOUND_NUMBER) { +- info->max_physmem_bits = NUMBER(MAX_PHYSMEM_BITS); +- return TRUE; +- } +- - /* - * The older ppc64 kernels uses _MAX_PHYSMEM_BITS as 42 and the - * newer kernels 3.7 onwards uses 46 bits. @@ -67,10 +74,10 @@ index 9d8f252..6f4860f 100644 - - return FALSE; -} -- + int get_machdep_info_ppc64(void) - { +@@ -507,10 +469,8 @@ get_machdep_info_ppc64(void) unsigned long vmlist, vmap_area_list, vmalloc_start; info->section_size_bits = _SECTION_SIZE_BITS; @@ -83,6 +90,3 @@ index 9d8f252..6f4860f 100644 info->page_offset = __PAGE_OFFSET; if (SYMBOL(_stext) == NOT_FOUND_SYMBOL) { --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.7.bb b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb index 165e192cb..475465124 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.7.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb @@ -5,12 +5,15 @@ DESCRIPTION = "\ images without extra uneeded information (zero pages, userspace programs, \ etc). \ " -HOMEPAGE = "http://makedumpfile.sourceforge.net" +HOMEPAGE = "https://github.com/makedumpfile/makedumpfile" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" LICENSE = "GPLv2.0" -DEPENDS = "bzip2 zlib elfutils" +SRCBRANCH ?= "master" +SRCREV = "18e0cdba48feeccea2429b3b0b2691f4314d1062" + +DEPENDS = "bzip2 zlib elfutils xz" RDEPENDS_${PN}-tools = "perl ${PN}" # arm and aarch64 would compile but has never been tested upstream. mips would not compile. @@ -21,16 +24,14 @@ PACKAGES =+ "${PN}-tools" FILES_${PN}-tools = "${bindir}/*.pl" SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \ + git://github.com/makedumpfile/makedumpfile;branch=${SRCBRANCH} \ file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \ - file://0001-PATCH-Remove-duplicated-variable-definitions.patch \ " -SRC_URI[md5sum] = "808ef840ca49ca6bfde77c097cf429f5" -SRC_URI[sha256sum] = "e702fbdf62b4cd829a76e46f3e24eb3fc7501918b85ebdcd8baef4f53d6ee2c8" -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/makedumpfile/files/makedumpfile/" -UPSTREAM_CHECK_REGEX = "makedumpfile/(?P<pver>\d+(\.\d+)+)/" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" SECTION = "base" @@ -40,8 +41,13 @@ SECTION = "base" EXTRA_OEMAKE = "\ LINKTYPE=static \ TARGET=${TARGET_ARCH} \ + ${PACKAGECONFIG_CONFARGS} \ " +PACKAGECONFIG ??= "" +PACKAGECONFIG[lzo] = "USELZO=on,USELZO=off,lzo" +PACKAGECONFIG[snappy] = "USESNAPPY=on,USESNAPPY=off,snappy" + do_install () { mkdir -p ${D}/usr/bin install -m 755 ${S}/makedumpfile ${D}/usr/bin diff --git a/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0001-trace-cmd-make-it-build-with-musl.patch b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0001-trace-cmd-make-it-build-with-musl.patch new file mode 100644 index 000000000..220991804 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/files/0001-trace-cmd-make-it-build-with-musl.patch @@ -0,0 +1,132 @@ +From b63f13d2df91ede45288653b21e0d30a6b45f2ac Mon Sep 17 00:00:00 2001 +From: Beniamin Sandu <beniaminsandu@gmail.com> +Date: Mon, 30 Nov 2020 18:24:48 +0200 +Subject: [PATCH] trace-cmd: make it build with musl + +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com> +--- + include/trace-cmd/trace-cmd.h | 1 + + lib/trace-cmd/trace-msg.c | 1 + + lib/trace-cmd/trace-plugin.c | 2 ++ + lib/tracefs/tracefs-events.c | 1 + + tracecmd/trace-agent.c | 1 + + tracecmd/trace-setup-guest.c | 1 + + tracecmd/trace-tsync.c | 15 ++++++++++----- + 7 files changed, 17 insertions(+), 5 deletions(-) + +diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h +index f3c95f3..a697905 100644 +--- a/include/trace-cmd/trace-cmd.h ++++ b/include/trace-cmd/trace-cmd.h +@@ -6,6 +6,7 @@ + #ifndef _TRACE_CMD_H + #define _TRACE_CMD_H + ++#include <sys/types.h> + #include "traceevent/event-parse.h" + + #define TRACECMD_MAGIC { 23, 8, 68 } +diff --git a/lib/trace-cmd/trace-msg.c b/lib/trace-cmd/trace-msg.c +index 4a0bfa9..fc1f2c7 100644 +--- a/lib/trace-cmd/trace-msg.c ++++ b/lib/trace-cmd/trace-msg.c +@@ -21,6 +21,7 @@ + #include <arpa/inet.h> + #include <sys/types.h> + #include <linux/types.h> ++#include <byteswap.h> + + #include "trace-write-local.h" + #include "trace-cmd-local.h" +diff --git a/lib/trace-cmd/trace-plugin.c b/lib/trace-cmd/trace-plugin.c +index 92f9edf..c2ef3dc 100644 +--- a/lib/trace-cmd/trace-plugin.c ++++ b/lib/trace-cmd/trace-plugin.c +@@ -8,6 +8,8 @@ + #include <dlfcn.h> + #include <sys/stat.h> + #include <libgen.h> ++#include <limits.h> ++ + #include "trace-cmd.h" + #include "trace-local.h" + +diff --git a/lib/tracefs/tracefs-events.c b/lib/tracefs/tracefs-events.c +index 8e825f5..a8d8560 100644 +--- a/lib/tracefs/tracefs-events.c ++++ b/lib/tracefs/tracefs-events.c +@@ -13,6 +13,7 @@ + #include <errno.h> + #include <sys/stat.h> + #include <fcntl.h> ++#include <limits.h> + + #include "kbuffer.h" + #include "tracefs.h" +diff --git a/tracecmd/trace-agent.c b/tracecmd/trace-agent.c +index b581696..abfefac 100644 +--- a/tracecmd/trace-agent.c ++++ b/tracecmd/trace-agent.c +@@ -20,6 +20,7 @@ + #include <unistd.h> + #include <linux/vm_sockets.h> + #include <pthread.h> ++#include <limits.h> + + #include "trace-local.h" + #include "trace-msg.h" +diff --git a/tracecmd/trace-setup-guest.c b/tracecmd/trace-setup-guest.c +index 899848c..99595a1 100644 +--- a/tracecmd/trace-setup-guest.c ++++ b/tracecmd/trace-setup-guest.c +@@ -13,6 +13,7 @@ + #include <string.h> + #include <sys/stat.h> + #include <unistd.h> ++#include <limits.h> + + #include "trace-local.h" + #include "trace-msg.h" +diff --git a/tracecmd/trace-tsync.c b/tracecmd/trace-tsync.c +index e639788..b8b5ac3 100644 +--- a/tracecmd/trace-tsync.c ++++ b/tracecmd/trace-tsync.c +@@ -104,13 +104,15 @@ int tracecmd_host_tsync(struct buffer_instance *instance, + + pthread_attr_init(&attrib); + pthread_attr_setdetachstate(&attrib, PTHREAD_CREATE_JOINABLE); +- if (!get_first_cpu(&pin_mask, &mask_size)) +- pthread_attr_setaffinity_np(&attrib, mask_size, pin_mask); + + ret = pthread_create(&instance->tsync_thread, &attrib, + tsync_host_thread, &instance->tsync); +- if (!ret) ++ if (!ret) { ++ if (!get_first_cpu(&pin_mask, &mask_size)) ++ pthread_setaffinity_np(instance->tsync_thread, mask_size, pin_mask); + instance->tsync_thread_running = true; ++ } ++ + if (pin_mask) + CPU_FREE(pin_mask); + pthread_attr_destroy(&attrib); +@@ -243,11 +245,14 @@ unsigned int tracecmd_guest_tsync(char *tsync_protos, + pthread_attr_init(&attrib); + tsync->sync_proto = proto; + pthread_attr_setdetachstate(&attrib, PTHREAD_CREATE_JOINABLE); +- if (!get_first_cpu(&pin_mask, &mask_size)) +- pthread_attr_setaffinity_np(&attrib, mask_size, pin_mask); + + ret = pthread_create(thr_id, &attrib, tsync_agent_thread, tsync); + ++ if (!ret) { ++ if (!get_first_cpu(&pin_mask, &mask_size)) ++ pthread_setaffinity_np(*thr_id, mask_size, pin_mask); ++ } ++ + if (pin_mask) + CPU_FREE(pin_mask); + pthread_attr_destroy(&attrib); +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb new file mode 100644 index 000000000..d39afff8e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb @@ -0,0 +1,17 @@ +SUMMARY = "User-space front-end command-line tool for ftrace" + +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=873f48a813bded3de6ebc54e6880c4ac" + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;branch=master \ + file://0001-trace-cmd-make-it-build-with-musl.patch" + +SRCREV = "530b1a0caef39466e16bbd49de5afef89656f03f" + +S = "${WORKDIR}/git" + +do_install() { + oe_runmake etcdir=${sysconfdir} DESTDIR=${D} install +} + +FILES_${PN} += "${libdir}/traceevent/plugins" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb index ebb95cf78..3344821fa 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb @@ -18,8 +18,40 @@ SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc7 inherit cmake DEPENDS = "libcap file bzip2" -RDEPENDS_${PN} = "perl" +RDEPENDS_dirsplit = "perl" + +PACKAGES =+ "dirsplit genisoimage icedax wodim" + +FILES_dirsplit = " \ + ${bindir}/dirsplit \ +" + +FILES_genisoimage = " \ + ${bindir}/devdump \ + ${bindir}/genisoimage \ + ${bindir}/isodebug \ + ${bindir}/isodump \ + ${bindir}/isoinfo \ + ${bindir}/isovfy \ + ${bindir}/mkisofs \ +" + +FILES_icedax = " \ + ${bindir}/cdda2mp3 \ + ${bindir}/cdda2ogg \ + ${bindir}/icedax \ + ${bindir}/pitchplay \ + ${bindir}/readmult \ +" + +FILES_wodim = " \ + ${bindir}/readom \ + ${bindir}/wodim \ + ${sbindir}/netscsid \ +" do_install_append() { ln -sf ${bindir}/genisoimage ${D}${bindir}/mkisofs } + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Use-SYS_futex-instead-of-__NR_futex.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Use-SYS_futex-instead-of-__NR_futex.patch new file mode 100644 index 000000000..dd1b7ccfd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Use-SYS_futex-instead-of-__NR_futex.patch @@ -0,0 +1,62 @@ +From 83068f9b71aea16d1ad036fdcc326de1027b5585 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Nov 2020 22:13:29 -0800 +Subject: [PATCH] Use SYS_futex instead of __NR_futex + +SYS_futex is expected from system C library. +in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) +rv32 is using 64bit time_t from get go unlike other 32bit architectures +in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 +this aliases it to NR_futex so that SYS_futex is then defined for rv32 + +Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/670] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + linux/JackLinuxFutex.cpp | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/linux/JackLinuxFutex.cpp b/linux/JackLinuxFutex.cpp +index deff006b..aef99cd2 100644 +--- a/linux/JackLinuxFutex.cpp ++++ b/linux/JackLinuxFutex.cpp +@@ -29,6 +29,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include <syscall.h> + #include <linux/futex.h> + ++#if !defined(SYS_futex) && defined(SYS_futex_time64) ++#define SYS_futex SYS_futex_time64 ++#endif ++ + namespace Jack + { + +@@ -67,7 +71,7 @@ bool JackLinuxFutex::Signal() + if (! fFutex->internal) return true; + } + +- ::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL, NULL, 0); ++ ::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL, NULL, 0); + return true; + } + +@@ -94,7 +98,7 @@ bool JackLinuxFutex::Wait() + if (__sync_bool_compare_and_swap(&fFutex->futex, 1, 0)) + return true; + +- if (::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, NULL, NULL, 0) != 0 && errno != EWOULDBLOCK) ++ if (::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, NULL, NULL, 0) != 0 && errno != EWOULDBLOCK) + return false; + } + } +@@ -122,7 +126,7 @@ bool JackLinuxFutex::TimedWait(long usec) + if (__sync_bool_compare_and_swap(&fFutex->futex, 1, 0)) + return true; + +- if (::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, &timeout, NULL, 0) != 0 && errno != EWOULDBLOCK) ++ if (::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, &timeout, NULL, 0) != 0 && errno != EWOULDBLOCK) + return false; + } + } +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch index dda21a32d..1bdc5adbc 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch @@ -1,4 +1,4 @@ -From 76b8a389268275cc13f3b4e61394d40b24ec56f1 Mon Sep 17 00:00:00 2001 +From f8cb818ca96fc2a45a04448a51f25a277ec183db Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 15 Jan 2020 20:21:58 -0800 Subject: [PATCH] example-clients: Use c++ compiler for jack_simdtests @@ -12,22 +12,26 @@ x86_64-yoe-linux-ld: example-clients/simdtests.cpp.28.o: undefined reference to Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/536] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - example-clients/wscript | 2 ++ - 1 file changed, 2 insertions(+) + example-clients/wscript | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) -diff --git a/example-clients/wscript b/example-clients/wscript -index a8857aa7..df9435aa 100644 --- a/example-clients/wscript +++ b/example-clients/wscript -@@ -69,6 +69,8 @@ def build(bld): +@@ -49,10 +49,15 @@ def build(bld): + else: + use = ['clientlib'] ++ if example_program == 'jack_simdtests': ++ ftrs = 'cxx cxxprogram' ++ else: ++ ftrs = 'c cprogram' ++ if bld.env['IS_MACOSX']: - prog = bld(features='c cprogram', framework = ['Foundation']) -+ elif example_program == 'jack_simdtests': -+ prog = bld(features='cxx cxxprogram') +- prog = bld(features='c cprogram', framework = ['Foundation']) ++ prog = bld(features = ftrs, framework = ['Foundation']) else: - prog = bld(features='c cprogram') +- prog = bld(features='c cprogram') ++ prog = bld(features = ftrs) prog.includes = os_incdir + ['../common/jack', '../common'] --- -2.25.0 - + prog.source = example_program_source + prog.use = use diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.14.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.16.bb index e954341ff..c13d6261c 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.14.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.16.bb @@ -16,8 +16,9 @@ DEPENDS = "libsamplerate0 libsndfile1 readline" SRC_URI = "git://github.com/jackaudio/jack2.git \ file://0001-example-clients-Use-c-compiler-for-jack_simdtests.patch \ + file://0001-Use-SYS_futex-instead-of-__NR_futex.patch \ " -SRCREV = "b54a09bf7ef760d81fdb8544ad10e45575394624" +SRCREV = "5b78c2ef158c2d9ffe09818a7dd80209ed251c5f" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200819.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20201105.bb index c746b6e97..59375c862 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200819.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20201105.bb @@ -16,7 +16,7 @@ SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz # only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n" -SRC_URI[sha256sum] = "af3af7f2510b0b45f38892c232abca2cee2ab36a62503e7085b47ed2c3c2c537" +SRC_URI[sha256sum] = "89bdfba7fd215e16be2c9d46a797bf85c5f7f7c46b53dc8af2d1171a658da5b7" S = "${WORKDIR}/live" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb index 1a415c13c..173b695e1 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb @@ -33,6 +33,7 @@ PACKAGECONFIG[vulkan] = "-Dvulkan=true,-Dvulkan=false,vulkan-loader" LDFLAGS_append_mipsarch = " -latomic" LDFLAGS_append_x86 = " -latomic" +LDFLAGS_append_riscv32 = " -latomic" PACKAGES =+ "\ ${PN}-spa-plugins \ diff --git a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.6.bb b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.6.bb index 03a10ce62..b37441ecc 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.6.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.6.bb @@ -12,9 +12,10 @@ DEPENDS = "glib-2.0 dbus json-glib libsoup-2.4 intltool-native" inherit meson pkgconfig gtk-doc gobject-introspection vala -SRC_URI = "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/${PV}/geoclue-${PV}.tar" +SRCREV = "555d676a91494b98ad0d52639590608a9594a8d3" +SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;nobranch=1" -SRC_URI[sha256sum] = "76494f1262fd90faea05116aface7f580b9b50f7c525bc86ccf33409cea95e8d" +S = "${WORKDIR}/git" # Without this line, package is declared a library and named libgeoclue* AUTO_LIBNAME_PKGS = "" diff --git a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.0.4.bb index 600508097..ce11bc070 100644 --- a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_10.0.4.bb @@ -7,8 +7,8 @@ DEPENDS = "libpcre zlib libjpeg-turbo" SRC_URI = "${SOURCEFORGE_MIRROR}/qpdf/qpdf-${PV}.tar.gz" LIC_FILES_CHKSUM = "file://Artistic-2.0;md5=7806296b9fae874361e6fb10072b7ee3" -SRC_URI[md5sum] = "eb7fb7c6cd5d3036bf4f7a5e3f44d995" -SRC_URI[sha256sum] = "5d2277c738188b7f4e3f01a6db7f2937ed6df54671f1fba834cd3d7ff865827b" +SRC_URI[md5sum] = "b4c6a66c45bb946944c2fe14ef02d0e0" +SRC_URI[sha256sum] = "b191dc4af4ea4630cdc404a4ee95a0f21c12f56ecc4ae045f04425464d7c696e" inherit autotools-brokensep gettext @@ -21,6 +21,7 @@ EXTRA_OECONF = "--without-random \ EXTRA_OEMAKE_class-target = "LIBTOOL=${HOST_SYS}-libtool" LDFLAGS_append_mipsarch = " -latomic" +LDFLAGS_append_riscv32 = " -latomic" S="${WORKDIR}/${BPN}-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0001-Remove-defining-handle_interrupt-twice.patch b/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0001-Remove-defining-handle_interrupt-twice.patch deleted file mode 100644 index d6d6ae06d..000000000 --- a/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0001-Remove-defining-handle_interrupt-twice.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2c77b61506aa867a873e3691214983b3eb7f652d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Aug 2020 19:49:35 -0700 -Subject: [PATCH] Remove defining handle_interrupt twice - -Fixes build with -fno-common - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tc.sig.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tc.sig.c b/tc.sig.c -index 77659ca..576605a 100644 ---- a/tc.sig.c -+++ b/tc.sig.c -@@ -56,7 +56,6 @@ int alrmcatch_disabled; /* = 0; */ - int phup_disabled; /* = 0; */ - int pchild_disabled; /* = 0; */ - int pintr_disabled; /* = 0; */ --int handle_interrupt; /* = 0; */ - - int - handle_pending_signals(void) --- -2.28.0 - diff --git a/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb b/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.22.03.bb index 541f5505f..fab626c61 100644 --- a/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb +++ b/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.22.03.bb @@ -12,10 +12,9 @@ SRC_URI = " \ https://astron.com/pub/${BPN}/${BP}.tar.gz \ file://0001-Enable-system-malloc-on-all-linux.patch \ file://0002-Add-debian-csh-scripts.patch \ - file://0001-Remove-defining-handle_interrupt-twice.patch \ " -SRC_URI[md5sum] = "f34909eab33733aecc05d27adc82277b" -SRC_URI[sha256sum] = "ed287158ca1b00ba477e8ea57bac53609838ebcfd05fcb05ca95021b7ebe885b" +SRC_URI[md5sum] = "c9387b7c8cf958956e75b1fa4e59b612" +SRC_URI[sha256sum] = "be2cfd653d2a0c7f506d2dd14c12324ba749bd484037be6df44a3973f52262b7" EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}'" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb index 9d78c3457..a83efe03c 100644 --- a/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb +++ b/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb @@ -12,8 +12,8 @@ SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz \ file://2ch_t.patch \ " -SRC_URI_append_class-target = "file://target-helpers.patch" -SRC_URI_append_class-native = "file://native-helpers.patch" +SRC_URI_append_class-target = " file://target-helpers.patch" +SRC_URI_append_class-native = " file://native-helpers.patch" SRC_URI[md5sum] = "1f558ff7ed296787b55bb1c6cf131108" SRC_URI[sha256sum] = "d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547" diff --git a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.4.bb b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.5.bb index 621e174ff..ff05227aa 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.5.bb @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4097ec544cf01e9c7cfc4bdf8e4ed887" SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https" -SRCREV = "d34077d7ee45fa7d1947cc0174919452fac31597" +SRCREV = "513f5edbcf2f2ec5c0cd711d1cc312eb2d753f1b" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord.bb b/meta-openembedded/meta-oe/recipes-support/colord/colord.bb index df86708e2..f514c0b78 100644 --- a/meta-openembedded/meta-oe/recipes-support/colord/colord.bb +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord.bb @@ -36,7 +36,7 @@ FILES_${PN} += " \ ${datadir}/glib-2.0 \ ${datadir}/color \ ${systemd_user_unitdir} \ - ${libdir}/tmpfiles.d \ + ${nonarch_libdir}/tmpfiles.d \ ${libdir}/colord-plugins \ ${libdir}/colord-sensors \ " diff --git a/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb b/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb new file mode 100644 index 000000000..472b72fc2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Modern C++ network programming libraries." + +# This library provides general purpose network functionality such as +# socket communication to agent libraries. It was designed to be merged +# into boost at some point and follows similar header library approach +# for most functionality. + +SECTION = "libs" +LICENSE = "BSL-1.0 & MIT & Python-2.0" +LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" + +SRC_URI = "\ + git://github.com/cpp-netlib/cpp-netlib.git;protocol=https;branch=0.13-release \ +" +SRC_URI[sha256sum] = "0b9255bb0668d89867a1f367d770f12d7038db4f5b6111774ef032f669cccad4" + +SRCREV = "ca95f04d140acf619892ee02a82e930dd91ff7d4" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +DEPENDS = "zlib boost openssl" + +EXTRA_OECMAKE_append = " -DCPP-NETLIB_BUILD_TESTS=OFF -DCPP-NETLIB_BUILD_EXAMPLES=OFF" + diff --git a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb index 4305e3b40..4305e3b40 100644 --- a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb diff --git a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.10.bb index 8a2ac6934..86353712d 100644 --- a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.10.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libusb1" SRC_URI = "http://dfu-util.sourceforge.net/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "233bb1e08ef4b405062445d84e28fde6" -SRC_URI[sha256sum] = "36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833" +SRC_URI[md5sum] = "8cf55663703cdc6b40f377f999eb8d3d" +SRC_URI[sha256sum] = "a03dc58dfc79c056819c0544b2a5970537566460102b3d82cfb038c60e619b42" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/fbset/fbset_2.1.bb b/meta-openembedded/meta-oe/recipes-support/fbset/fbset_2.1.bb index fbf834da1..e3e406ff5 100644 --- a/meta-openembedded/meta-oe/recipes-support/fbset/fbset_2.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/fbset/fbset_2.1.bb @@ -14,7 +14,7 @@ DEPENDS = "bison-native flex-native" PR = "r4" -SRC_URI = "http://ftp.debian.org/debian/pool/main/f/fbset/fbset_2.1.orig.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/f/fbset/fbset_2.1.orig.tar.gz \ file://makefile.patch \ file://fbset-2.1-fix-makefile-dep.patch \ file://0001-fbset-including-asm-types.h-is-needed-on-all-linux-s.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.1.3.bb index d52731161..9820b8647 100644 --- a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.1.3.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=af88d758f75f3c5c48a967501f24384b" SRC_URI += "git://github.com/fmtlib/fmt" -SRCREV = "cd4af11efc9c622896a3e4cb599fa28668ca3d05" +SRCREV = "7bdf0628b1276379886c7f6dda2cef2b3b374f0b" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-profile-handler-Specify-libc-specific-thread_id.patch b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-profile-handler-Specify-libc-specific-thread_id.patch new file mode 100644 index 000000000..4029a69c5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-profile-handler-Specify-libc-specific-thread_id.patch @@ -0,0 +1,38 @@ +From 0a504852ed6e56620d1df26b503c4aa2b5b74760 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 31 Oct 2020 16:12:36 -0700 +Subject: [PATCH] profile-handler: Specify libc specific thread_id + +We need to know internal _sigev_un is glibc specific, add an else for +musl case + +Fixes build issue +../git/src/profile-handler.cc:275:8: error: no member named '_sigev_un' in 'sigevent' + sevp._sigev_un._tid = sys_gettid(); + ~~~~ ^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/profile-handler.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/profile-handler.cc b/src/profile-handler.cc +index 7fdcb69..5867118 100644 +--- a/src/profile-handler.cc ++++ b/src/profile-handler.cc +@@ -272,7 +272,11 @@ static void StartLinuxThreadTimer(int timer_type, int signal_number, + struct itimerspec its; + memset(&sevp, 0, sizeof(sevp)); + sevp.sigev_notify = SIGEV_THREAD_ID; ++#ifdef __GLIBC__ + sevp._sigev_un._tid = sys_gettid(); ++#else ++ sevp.sigev_notify_thread_id = sys_gettid(); ++#endif + sevp.sigev_signo = signal_number; + clockid_t clock = CLOCK_THREAD_CPUTIME_ID; + if (timer_type == ITIMER_REAL) { +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.bb b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.bb index 662777b47..d9b310bce 100644 --- a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.bb @@ -10,6 +10,7 @@ SRC_URI = "git://github.com/gperftools/gperftools \ file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \ file://disable_libunwind_aarch64.patch \ file://sgidef.patch \ + file://0001-profile-handler-Specify-libc-specific-thread_id.patch \ " inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb index 5afc4596e..df68a850a 100644 --- a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb @@ -11,6 +11,6 @@ DEPENDS = "libusb udev" inherit autotools pkgconfig SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https" -PV = "0.9.0" -SRCREV = "7da5cc91fc0d2dbe4df4f08cd31f6ca1a262418f" +PV = "0.10.1" +SRCREV = "f6d0073fcddbdda24549199445e844971d3c9cef" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb index cc12a6890..85646062f 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.340" -SRCREV = "60d9f39b0542607fcc436e7aebf6b05a9ca674ff" +PV = "0.341" +SRCREV = "82fc979083e959a749ea5bb919aa6d7d61123ae0" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index 70cb237d9..ac81fc75a 100644 --- a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -4,7 +4,8 @@ HOMEPAGE = "https://www.imagemagick.org/" DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \ editing raster and vector image files. It can read and write over 200 image file formats." LICENSE = "ImageMagick" -LIC_FILES_CHKSUM = "file://LICENSE;md5=41b4fa9af60c88e61484b02c0561181a" +LIC_FILES_CHKSUM = "file://LICENSE;md5=41b4fa9af60c88e61484b02c0561181a \ + file://NOTICE;md5=a2aa6e41f8a40700196a9ce301693e34" # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" diff --git a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch deleted file mode 100644 index 2c7cd9970..000000000 --- a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 22bff509e2a0e5640994bc92ded62c383d99bc37 Mon Sep 17 00:00:00 2001 -From: Pierre-Jean Texier <pjtexier@koncepto.io> -Date: Mon, 24 Feb 2020 21:44:45 +0100 -Subject: [PATCH] Makefile.am: add build rule for README - -Fixes: - -| configure.ac:17: installing 'config/config.sub' -| configure.ac:16: installing 'config/install-sh' -| configure.ac:16: installing 'config/missing' -| Makefile.am: error: required file './README' not found -| libinotifytools/src/Makefile.am: installing 'config/depcomp' - -Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/111] - -Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> ---- - Makefile.am | 2 ++ - autogen.sh | 1 - - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 56e4531..d08c8fe 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,6 +2,8 @@ ACLOCAL_AMFLAGS = -I m4 - - SUBDIRS = libinotifytools src man - -+README: README.md -+ - dist-hook: - # Automake official documentation states that dist-hook should assume files - # are not writable. -diff --git a/autogen.sh b/autogen.sh -index 48eb21d..31572c2 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -1,4 +1,3 @@ - #!/bin/sh - --cp README.md README - autoreconf --install "$@" || exit 1 --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb index f42abeb2b..8206590a8 100644 --- a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb @@ -5,12 +5,10 @@ SECTION = "console/devel" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" -SRCREV = "cfa93aa19f81d85b63cd64da30c7499890d4c07d" -PV = "3.20.2.2" +SRCREV = "98e8dfa47eb6a6ba52e35de55d2de21b274a4af8" +PV = "3.20.11.0" -SRC_URI = "git://github.com/rvoicilas/${BPN} \ - file://0001-Makefile.am-add-build-rule-for-README.patch \ - " +SRC_URI = "git://github.com/rvoicilas/${BPN}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb b/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb index c33c79111..8479b274e 100644 --- a/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM= "\ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ " -DEPENDS = "libusb1 python3" +DEPENDS = "libusb1 python3 swig-native" SRC_URI = "http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2" SRC_URI[md5sum] = "0c09fb2bb19a57c839fa6845c6c780a2" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.2.bb index 6433675ca..c0cf54589 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.2.bb @@ -5,12 +5,12 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" SRC_URI = "https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "064c2627397e6641c52de09a26951112" -SRC_URI[sha256sum] = "f1cda2789e6a13a92aefc012a76e5a7cc57a1b402d66f71df8719ee314b67699" +SRC_URI[md5sum] = "4765470becb619fead3cdaeac61b9a77" +SRC_URI[sha256sum] = "c601e71846f5ab140c83bc757fdd62a4fda24a9cee39cc5e99c96ec2bf1b06a9" inherit autotools pkgconfig python3native -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2" PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb/0001-generate-version-script-Don-t-hard-code-the-path-of-.patch b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb/0001-generate-version-script-Don-t-hard-code-the-path-of-.patch deleted file mode 100644 index 41e64d7d8..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb/0001-generate-version-script-Don-t-hard-code-the-path-of-.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 76c23503ed1002d3aad0118795006fe2128006ae Mon Sep 17 00:00:00 2001 -From: Ting-Wei Lan <lantw@src.gnome.org> -Date: Sat, 21 Mar 2020 22:13:57 +0800 -Subject: [PATCH] generate-version-script: Don't hard-code the path of python3 - -Python can be installed in different directories on different operating -systems, so we can't hard-code the path of it. Instead, use meson to -find it to avoid 'no such file or directory' error on the bad path. - -Upstream-Status: Backport [https://github.com/hughsie/libgusb/pull/36] -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> ---- - contrib/generate-version-script.py | 1 - - gusb/meson.build | 4 ++++ - 2 files changed, 4 insertions(+), 1 deletion(-) - mode change 100755 => 100644 contrib/generate-version-script.py - -diff --git a/contrib/generate-version-script.py b/contrib/generate-version-script.py -old mode 100755 -new mode 100644 -index c4ee238ab0ab..0fe2b24e47e3 ---- a/contrib/generate-version-script.py -+++ b/contrib/generate-version-script.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python3 - # pylint: disable=invalid-name,missing-docstring - # - # Copyright (C) 2017 Richard Hughes <richard@hughsie.com> -diff --git a/gusb/meson.build b/gusb/meson.build -index 10a6f537a642..28ca3c63e595 100644 ---- a/gusb/meson.build -+++ b/gusb/meson.build -@@ -142,6 +142,9 @@ libgusb_girtarget = gnome.generate_gir(gusb, - libgusb_gir = libgusb_girtarget[0] - libgusb_typelib = libgusb_girtarget[1] - -+pymod = import('python') -+py_installation = pymod.find_installation('python3') -+ - # Verify the map file is correct -- note we can't actually use the generated - # file for two reasons: - # -@@ -154,6 +157,7 @@ mapfile_target = custom_target('gusb_mapfile', - input: libgusb_girtarget[0], - output: 'libgusb.ver', - command: [ -+ py_installation, - join_paths(meson.source_root(), 'contrib', 'generate-version-script.py'), - 'LIBGUSB', - '@INPUT@', --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.4.bb b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.5.bb index bd88c8ed4..c4b0ff372 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.5.bb @@ -7,7 +7,6 @@ DEPENDS = "glib-2.0 libusb" inherit meson gobject-introspection gtk-doc gettext vala SRC_URI = "git://github.com/hughsie/libgusb.git \ - file://0001-generate-version-script-Don-t-hard-code-the-path-of-.patch \ " -SRCREV = "377917fed85476d615f72279d0c97bc391d0f191" +SRCREV = "1f712812327091c42c62b1ab1148d738d1a22b51" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libharu/libharu/0001-Install-static-lib-into-var-libdir-rather-than-hardc.patch b/meta-openembedded/meta-oe/recipes-support/libharu/libharu/0001-Install-static-lib-into-var-libdir-rather-than-hardc.patch new file mode 100644 index 000000000..0947de196 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libharu/libharu/0001-Install-static-lib-into-var-libdir-rather-than-hardc.patch @@ -0,0 +1,30 @@ +From 9341ac4f6ae38efe95dfd188105a9ea30941ccf6 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@cn.fujitsu.com> +Date: Wed, 18 Nov 2020 23:09:51 +0900 +Subject: [PATCH] Install static lib into var-libdir rather than hardcod lib. + +Lei Maohui <leimaohui@cn.fujitsu.com> + +Upstream-Status: Pending +--- + src/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 249916c..fb06ea3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -75,8 +75,8 @@ if(LIBHPDF_STATIC) + target_link_libraries(${LIBHPDF_NAME_STATIC} ${ADDITIONAL_LIBRARIES}) + install( + TARGETS ${LIBHPDF_NAME_STATIC} +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin + ) + if(WIN32 AND NOT CYGWIN) +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libharu/libharu_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/libharu/libharu_2.3.0.bb index 2d1a37c42..8d30c1f7b 100644 --- a/meta-openembedded/meta-oe/recipes-support/libharu/libharu_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libharu/libharu_2.3.0.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://README;md5=3ee6bc1f64d9cc7907f44840c8e50cb1" SRC_URI = "git://github.com/libharu/libharu.git;branch=2_3 \ file://libharu-RELEASE_2_3_0_cmake.patch \ + file://0001-Install-static-lib-into-var-libdir-rather-than-hardc.patch \ " SRCREV = "4ae1d5f4c84459f130bf1b1ef4c5c330af8eca5d" diff --git a/meta-openembedded/meta-oe/recipes-support/liboop/liboop_1.0.1.bb b/meta-openembedded/meta-oe/recipes-support/liboop/liboop_1.0.1.bb index 8ba3f72b7..8894a867d 100644 --- a/meta-openembedded/meta-oe/recipes-support/liboop/liboop_1.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/liboop/liboop_1.0.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.lysator.liu.se/liboop/" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=8b54f38ccbd44feb80ab90e01af8b700" -SRC_URI = "http://ftp.debian.org/debian/pool/main/libo/liboop/liboop_${PV}.orig.tar.gz \ +SRC_URI = "http://ftp.lysator.liu.se/pub/liboop/liboop-${PV}.tar.gz \ file://tcl_dev.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest b/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest index 2a7922f1a..c213b32e5 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest @@ -1,7 +1,8 @@ #!/bin/sh ptestdir=$(dirname "$(readlink -f "$0")") -for test in $(ls $ptestdir/tests) +cd tests +for test in $(ls) do - ./test-driver --test-name $test --log-file $test.log --trs-file $test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./tests/$test + ./../test-driver --test-name $test --log-file ../$test.log --trs-file ../$test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./$test done diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb index a1d85617a..38f162693 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb @@ -28,7 +28,9 @@ PACKAGECONFIG[gcrypt] = "--with-crypto=libgcrypt --with-libgcrypt-prefix=${STAGI BBCLASSEXTEND = "native nativesdk" -RDEPENDS_${PN}-ptest = "bash" +# required for ptest on documentation +RDEPENDS_${PN}-ptest = "man-db" +RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-en-us" do_compile_ptest() { sed -i "/\$(MAKE) \$(AM_MAKEFLAGS) check-TESTS/d" tests/Makefile @@ -40,4 +42,6 @@ do_install_ptest() { install -m 0755 ${B}/tests/.libs/simple ${D}${PTEST_PATH}/tests/ install -m 0755 ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/ + mkdir -p ${D}${PTEST_PATH}/docs + cp -r ${S}/docs/* ${D}${PTEST_PATH}/docs/ } diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Fix-build-on-32bit-architectures-with-6bit-time.patch b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Fix-build-on-32bit-architectures-with-6bit-time.patch new file mode 100644 index 000000000..01c5ccd53 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Fix-build-on-32bit-architectures-with-6bit-time.patch @@ -0,0 +1,35 @@ +From 0a9b12eda0f6e487398dad004121bdd1be792428 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 14 Nov 2020 16:18:44 -0800 +Subject: [PATCH] test: Fix build on 32bit architectures with 6bit time_t + +It uses SYS_futex, which it expects from system C library. +in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) +rv32 is using 64bit time_t from get go unlike other 32bit architectures +in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 +this aliases it to NR_futex so that SYS_futex is then defined for rv32 + +Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/237] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + test/35fa71a030ca-test.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/test/35fa71a030ca-test.c b/test/35fa71a030ca-test.c +index 4ecf211..7f2124b 100644 +--- a/test/35fa71a030ca-test.c ++++ b/test/35fa71a030ca-test.c +@@ -24,6 +24,10 @@ + + #include <linux/futex.h> + ++#if !defined(SYS_futex) && defined(SYS_futex_time64) ++# define SYS_futex SYS_futex_time64 ++#endif ++ + static void sleep_ms(uint64_t ms) + { + usleep(ms * 1000); +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb index 3a1eaef87..e122a907c 100644 --- a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_0.7.bb @@ -9,7 +9,9 @@ SECTION = "libs" LICENSE = "LGPLv2.1 | MIT" LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=d51b5805e2a675685e6a66ca50904cf9" -SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https" +SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \ + file://0001-test-Fix-build-on-32bit-architectures-with-6bit-time.patch \ + " SRCREV = "45f0735219a615ae848033c47c7e2d85d101d43e" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index 3c6c7edfc..11ee7ca8b 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \ DEPENDS += "libaio" -SRC_URI = "git://sourceware.org/git/lvm2.git \ +SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \ file://lvm.conf \ file://0001-implement-libc-specific-reopen_stream.patch \ file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.26.0.bb b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.1.bb index a954682d6..0a1442fc7 100644 --- a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.26.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.1.bb @@ -15,8 +15,8 @@ SRC_URI = " \ file://monitrc \ " -SRC_URI[md5sum] = "9f7dc65e902c103e4c5891354994c3df" -SRC_URI[sha256sum] = "87fc4568a3af9a2be89040efb169e3a2e47b262f99e78d5ddde99dd89f02f3c2" +SRC_URI[md5sum] = "200068f37847e3402f6a9b061c2d327e" +SRC_URI[sha256sum] = "f57408d16185687513a3c4eb3f2bb72eef76331ac16210e9652e846e5c84ed51" DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.57.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.59.bb index 5d9318a92..eb9162bea 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.57.bb +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.59.bb @@ -32,7 +32,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://nss-fix-nsinstall-build.patch \ file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ " -SRC_URI[sha256sum] = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382" +SRC_URI[sha256sum] = "e6298174caa8527beacdc2858f77ed098d7047c1792846040e27e420fed0ce24" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch deleted file mode 100644 index 78ffb22f8..000000000 --- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch +++ /dev/null @@ -1,32 +0,0 @@ -rename test target as run-test - -Upstream-Statue: Pending - -test target not only compile the test files, but also run them, which is -not suitable for cross-compile environment, so rename it as run-test. - -and define test target to compile the test files. - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - Makefile.am | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index b6db339..de176c4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -124,7 +124,9 @@ regress2: $(check_PROGRAMS) - test_numademo: numademo - ./numademo -t -e 10M - --test: all $(check_PROGRAMS) regress1 regress2 test_numademo -+test: all $(check_PROGRAMS) -+ -+run-test: all $(check_PROGRAMS) regress1 regress2 test_numademo - - TESTS_ENVIRONMENT = builddir='$(builddir)'; export builddir; - --- -1.9.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch deleted file mode 100644 index 9812ecc8b..000000000 --- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 59fd750a84bbe5874dec936d2bee9ef11a1b6505 Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Tue, 21 Jul 2015 02:01:22 +0900 -Subject: [PATCH] Fix the test output format - -Upstream-Status: Pending - -Signed-off-by: Roy Li <rongqing.li@windriver.com> -Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> ---- - test/regress | 6 +++--- - test/regress2 | 11 +++++------ - 2 files changed, 8 insertions(+), 9 deletions(-) - -diff --git a/test/regress b/test/regress -index 2ce1705..d086a47 100755 ---- a/test/regress -+++ b/test/regress -@@ -74,6 +74,7 @@ probe_hardware() - if [ $numnodes -lt 2 ] ; then - echo "need at least two nodes with at least $NEEDPAGES each of" - echo "free memory for mempolicy regression tests" -+ echo "FAIL: numa regress" - exit 77 # Skip test - fi - } -@@ -207,10 +208,9 @@ main() - rm A B - - if [ "$EXIT" = 0 ] ; then -- echo '========SUCCESS' -+ echo 'PASS: numactl regress' - else -- echo '========FAILURE' -- exit 1 -+ echo 'FAIL: numactl regress' - fi - } - -diff --git a/test/regress2 b/test/regress2 -index aa6ea41..450c510 100755 ---- a/test/regress2 -+++ b/test/regress2 -@@ -9,12 +9,11 @@ testdir=`dirname "$0"` - export PATH=${builddir}:$PATH - - T() { -- echo "$@" -- if ! $VALGRIND "$@" ; then -- echo $1 FAILED!!!! -- exit 1 -- fi -- echo -+ if ! $VALGRIND "$@" 2>&1 1>/dev/null; then -+ echo "FAIL: $1" -+ else -+ echo "PASS: $1" -+ fi - } - - # still broken --- -1.8.4.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Makefile b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Makefile deleted file mode 100644 index 9a5134c3f..000000000 --- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -.PHONY: regress1 regress2 - -regress1: - cd test ; ./regress - -regress2: - cd test ; ./regress2 diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/run-ptest b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/run-ptest deleted file mode 100755 index 215f7c25b..000000000 --- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/run-ptest +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -make regress1 -make regress2 -if numademo -t -e 10M; then - echo "PASS: numademo" -else - echo "FAIL: numademo" -fi - diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb b/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb deleted file mode 100644 index 504fe0327..000000000 --- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY = "Development package for building Applications that use numa" -HOMEPAGE = "http://oss.sgi.com/projects/libnuma/" -DESCRIPTION = "Simple NUMA policy support. It consists of a numactl program \ -to run other programs with a specific NUMA policy and a libnuma to do \ -allocations with NUMA policy in applications." -LICENSE = "GPL-2.0 & LGPL-2.1" -SECTION = "apps" - -inherit autotools-brokensep ptest - -LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=f8ff2391624f28e481299f3f677b21bb" - -SRCREV = "dd6de072c92c892a86e18c0fd0dfa1ba57a9a05d" -PV = "2.0.14+git${SRCPV}" - -SRC_URI = "git://github.com/numactl/numactl \ - file://Fix-the-test-output-format.patch \ - file://Makefile \ - file://run-ptest \ - file://0001-define-run-test-target.patch \ -" - -S = "${WORKDIR}/git" - -# ARM does not currently support NUMA -COMPATIBLE_HOST = "^((?!arm).*)$" - -LDFLAGS_append_riscv64 = " -latomic" -LDFLAGS_append_riscv32 = " -latomic" - -do_install() { - oe_runmake DESTDIR=${D} prefix=${D}/usr install - #remove the empty man2 directory - rm -r ${D}${mandir}/man2 -} - -do_compile_ptest() { - oe_runmake test -} - -do_install_ptest() { - #install tests binaries - local test_binaries="distance ftok mbind_mig_pages migrate_pages move_pages \ - mynode nodemap node-parse pagesize prefered randmap realloc_test \ - tbitmap tshared" - - [ ! -d ${D}/${PTEST_PATH}/test ] && mkdir -p ${D}/${PTEST_PATH}/test - for i in $test_binaries; do - install -m 0755 ${B}/test/.libs/$i ${D}${PTEST_PATH}/test - done - - local test_scripts="checktopology checkaffinity printcpu regress regress2 \ - shmtest runltp bind_range" - for i in $test_scripts; do - install -m 0755 ${B}/test/$i ${D}${PTEST_PATH}/test - done - - install -m 0755 ${WORKDIR}/Makefile ${D}${PTEST_PATH}/ - install -m 0755 ${B}/.libs/numactl ${D}${PTEST_PATH}/ -} - -RDEPENDS_${PN}-ptest = "bash" diff --git a/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb index 08b2e3c23..1514c7a95 100644 --- a/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -11,7 +11,7 @@ readers to remote machines via TCP/IP." DEPENDS += "libtool pcsc-lite libusb-compat" SRC_URI = " \ - ${DEBIAN_MIRROR}/main/o/${BPN}/${BPN}_${PV}.orig.tar.gz \ + https://downloads.sourceforge.net/project/opensc/${BPN}/${BPN}-${PV}.tar.gz \ file://etc-openct.udev.in-disablePROGRAM.patch \ file://etc-openct_usb.in-modify-UDEVINFO.patch \ file://openct.init \ diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch new file mode 100644 index 000000000..022680331 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch @@ -0,0 +1,28 @@ +From 114af1ca23ff9bf2e521b2969e343e74cdd8eac1 Mon Sep 17 00:00:00 2001 +From: Jose Quaresma <quaresma.jose@gmail.com> +Date: Sun, 1 Nov 2020 12:29:56 +0000 +Subject: [PATCH] samples: cmake: digits needs opencv_dnn module to build + +Intrudeced in commit 397ba2d9aafb5312e777ce2f886d7b568109e931: +add OpenCV sample for digit and text recongnition, and provide multiple OCR models. +https://github.com/opencv/opencv/commit/397ba2d9aafb5312e777ce2f886d7b568109e931 + +Upstream-Status: Backport [https://github.com/opencv/opencv/commit/79a82013ad2af04269891ce15281c9fdc31d3f66] + +Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> +--- + samples/cpp/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt +index 617629df2e..14ab6141df 100644 +--- a/samples/cpp/CMakeLists.txt ++++ b/samples/cpp/CMakeLists.txt +@@ -14,6 +14,7 @@ set(OPENCV_CPP_SAMPLES_REQUIRED_DEPS + opencv_features2d + opencv_calib3d + opencv_stitching ++ opencv_dnn + ${OPENCV_MODULES_PUBLIC} + ${OpenCV_LIB_COMPONENTS}) + ocv_check_dependencies(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS}) diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.4.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.0.bb index c83186de0..b223334a5 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.0.bb @@ -2,16 +2,16 @@ SUMMARY = "Opencv : The Open Computer Vision Library" HOMEPAGE = "http://opencv.org/" SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=19598330421859a6dd353a4318091ac7" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "c3bb57afeaf030f10939204d48d7c2a3842f4293" -SRCREV_contrib = "5fae4082cc493efa5cb7a7486f9e009618a5198b" +SRCREV_opencv = "d5fd2f0155ffad366f9ac912dfd6d189a7a6a98e" +SRCREV_contrib = "37315babf9984a5b6aa981644a20dd8df1a5ff02" SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" @@ -49,6 +49,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://0001-Dont-use-isystem.patch \ file://download.patch \ file://0001-Make-ts-module-external.patch \ + file://0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch \ " SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.51.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.56.bb index d2c574608..4c0f179cb 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.51.bb +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.56.bb @@ -25,8 +25,8 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$ file://remove-user-host-pwd-from-version.patch \ " -SRC_URI[md5sum] = "0d2025896cf1c17af7304ecc57ec9531" -SRC_URI[sha256sum] = "f490775ea4c6506b7210ee55a102c8f4aacfe9d1c8eaa633c7316d33a714be62" +SRC_URI[md5sum] = "82a7dcf7aeaf95fdad16017c0ed9983a" +SRC_URI[sha256sum] = "25520e0363c93f3bcb89802a4aa3db33046206039436e0c7c9262db5a61115e0" DEPENDS = "util-linux groff-native" diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.20.0.bb b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.20.1.bb index a815980c4..2fbf60c14 100644 --- a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.20.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.20.1.bb @@ -9,10 +9,10 @@ eID cards have also been confirmed to work." HOMEPAGE = "http://www.opensc-project.org/opensc/" SECTION = "System Environment/Libraries" LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" +LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" -#v0.19.0 -SRCREV = "45e29056ccde422e70ed3585084a7f150c632515" +#v0.21.0 +SRCREV = "30180986a08cf71fe4af4b50251a8bb5b1ab95af" SRC_URI = "git://github.com/OpenSC/OpenSC \ " DEPENDS = "virtual/libiconv openssl" diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb index 6f38d65e0..c1b793960 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb @@ -36,6 +36,7 @@ PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy ${PN}-spy-de RRECOMMENDS_${PN} = "ccid" RRECOMMENDS_${PN}_class-native = "" +RPROVIDES_${PN}_class-native += "pcsc-lite-lib-native" FILES_${PN} = "${sbindir}/pcscd" FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch new file mode 100644 index 000000000..e6b673b11 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch @@ -0,0 +1,47 @@ +From 98d277655e411f56fba705c0bf2efc6562c23807 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Nov 2020 11:37:33 -0800 +Subject: [PATCH] Add support of arch riscv32 + +Upstream-Status: Submitted [https://github.com/pocoproject/poco/pull/3138] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Foundation/include/Poco/Platform.h | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h +index 799db417e..b8506a248 100644 +--- a/Foundation/include/Poco/Platform.h ++++ b/Foundation/include/Poco/Platform.h +@@ -135,6 +135,7 @@ + #define POCO_ARCH_AARCH64 0x0f + #define POCO_ARCH_ARM64 0x0f // same as POCO_ARCH_AARCH64 + #define POCO_ARCH_RISCV64 0x10 ++#define POCO_ARCH_RISCV32 0x11 + + + #if defined(__ALPHA) || defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA) +@@ -225,12 +226,16 @@ + #elif defined(__AARCH64EB__) + #define POCO_ARCH POCO_ARCH_AARCH64 + #define POCO_ARCH_BIG_ENDIAN 1 +-#elif defined(__riscv) && (__riscv_xlen == 64) +- #define POCO_ARCH POCO_ARCH_RISCV64 +- #define POCO_ARCH_LITTLE_ENDIAN 1 ++#elif defined(__riscv) ++ #if (__riscv_xlen == 64) ++ #define POCO_ARCH POCO_ARCH_RISCV64 ++ #define POCO_ARCH_LITTLE_ENDIAN 1 ++ #elif(__riscv_xlen == 32) ++ #define POCO_ARCH POCO_ARCH_RISCV32 ++ #define POCO_ARCH_LITTLE_ENDIAN 1 ++ #endif + #endif + +- + #if defined(__clang__) + #define POCO_COMPILER_CLANG + #elif defined(_MSC_VER) +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch deleted file mode 100644 index f4a358f47..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fa079dfc5e1d22ea35762bf4c5b09999bdc5e731 Mon Sep 17 00:00:00 2001 -From: Jochen Sprickerhof <git@jochen.sprickerhof.de> -Date: Wed, 22 Aug 2018 21:42:09 +0200 -Subject: [PATCH] Don't try to install non existing Encodings/testsuite/data - -Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/2437] ---- - Encodings/testsuite/CMakeLists.txt | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/Encodings/testsuite/CMakeLists.txt b/Encodings/testsuite/CMakeLists.txt -index 7508e5522..79495ae02 100644 ---- a/Encodings/testsuite/CMakeLists.txt -+++ b/Encodings/testsuite/CMakeLists.txt -@@ -19,12 +19,9 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE - add_executable( ${TESTUNIT} ${TEST_SRCS} ) - if(ANDROID) - add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} -- COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/data;" -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/${TESTUNIT} -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) -+ COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Encodings-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) - else() - add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -- # The test is run in the build directory. So the test data is copied there too -- add_custom_command(TARGET ${TESTUNIT} POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data ) - endif() - #set_target_properties( ${TESTUNIT} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) - target_link_libraries( ${TESTUNIT} PocoEncodings PocoFoundation CppUnit ) --- -2.18.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch deleted file mode 100644 index c0de32daf..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 589a5442a841b156a1890bc2d26e7a5103e2f672 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 1 Nov 2019 17:53:50 -0700 -Subject: [PATCH] riscv: Enable double operations when using double float abi - -Upstream-Status: Submitted [https://github.com/pocoproject/poco/pull/2825] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Foundation/src/utils.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index 69cea1aca..ff7a5c9ce 100644 ---- a/Foundation/src/utils.h -+++ b/Foundation/src/utils.h -@@ -63,7 +63,8 @@ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__AARCH64EL__) || \ -- defined(nios2) || defined(__nios2) || defined(__nios2__) -+ defined(nios2) || defined(__nios2) || defined(__nios2__) || \ -+ (defined(__riscv) && defined(__riscv_float_abi_double)) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) --- -2.23.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.4.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.10.1.bb index fcd521975..48b31dd3f 100644 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.10.1.bb @@ -10,11 +10,10 @@ DEPENDS = "libpcre zlib" SRC_URI = " \ git://github.com/pocoproject/poco.git;branch=poco-${PV} \ - file://0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch \ - file://0001-riscv-Enable-double-operations-when-using-double-flo.patch \ + file://0001-Add-support-of-arch-riscv32.patch \ file://run-ptest \ " -SRCREV = "b95393dcc3640807838e8323b4e600e54d2e8116" +SRCREV = "a3d827d80eb7f3329c58e73eb2906cb7ba829019" UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" @@ -25,16 +24,17 @@ inherit cmake ptest # By default the most commonly used poco components are built # Foundation is built anyway and doesn't need to be listed explicitly # these don't have dependencies outside oe-core -PACKAGECONFIG ??= "XML JSON MongoDB PDF Util Net NetSSL Crypto Data DataSQLite Zip Encodings Redis" +PACKAGECONFIG ??= "XML JSON MongoDB PDF Util Net NetSSL Crypto JWT Data DataSQLite Zip Encodings Redis" -PACKAGECONFIG[XML] = "-DENABLE_XML=ON -DEXPAT_LIBRARY:STRING=expat,-DENABLE_XML=OFF,expat" +PACKAGECONFIG[XML] = "-DENABLE_XML=ON,-DENABLE_XML=OFF,expat" PACKAGECONFIG[JSON] = "-DENABLE_JSON=ON,-DENABLE_JSON=OFF" PACKAGECONFIG[MongoDB] = "-DENABLE_MONGODB=ON,-DENABLE_MONGODB=OFF" PACKAGECONFIG[PDF] = "-DENABLE_PDF=ON,-DENABLE_PDF=OFF,zlib" PACKAGECONFIG[Util] = "-DENABLE_UTIL=ON,-DENABLE_UTIL=OFF" PACKAGECONFIG[Net] = "-DENABLE_NET=ON,-DENABLE_NET=OFF" -PACKAGECONFIG[NetSSL] = "-DENABLE_NETSSL=ON -DOPENSSL_SSL_LIBRARY:STRING=ssl -DOPENSSL_CRYPTO_LIBRARY:STRING=crypto,-DENABLE_NETSSL=OFF,openssl" -PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON -DOPENSSL_SSL_LIBRARY:STRING=ssl -DOPENSSL_CRYPTO_LIBRARY:STRING=crypto,-DENABLE_CRYPTO=OFF,openssl" +PACKAGECONFIG[NetSSL] = "-DENABLE_NETSSL=ON,-DENABLE_NETSSL=OFF,openssl" +PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON,-DENABLE_CRYPTO=OFF,openssl" +PACKAGECONFIG[JWT] = "-DENABLE_JWT=ON,-DENABLE_JWT=OFF,openssl" PACKAGECONFIG[Data] = "-DENABLE_DATA=ON,-DENABLE_DATA=OFF" PACKAGECONFIG[DataSQLite] = "-DENABLE_DATA_SQLITE=ON -DSQLITE3_LIBRARY:STRING=sqlite3,-DENABLE_DATA_SQLITE=OFF,sqlite3" PACKAGECONFIG[Zip] = "-DENABLE_ZIP=ON,-DENABLE_ZIP=OFF" @@ -53,7 +53,6 @@ PACKAGECONFIG[PageCompilerFile2Page] = "-DENABLE_PAGECOMPILER_FILE2PAGE=ON,-DENA PACKAGECONFIG[SevenZip] = "-DENABLE_SEVENZIP=ON,-DENABLE_SEVENZIP=OFF" EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \ - -DZLIB_LIBRARY_RELEASE:STRING=z -DPCRE_LIBRARY:STRING=pcre \ -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON ', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.9.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.10.bb index eda3f7ecd..46e33514e 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.10.bb @@ -3,8 +3,8 @@ DESCRIPTION = "Encoding files for use with poppler that enable poppler to \ correctly render CJK and Cyrrilic." HOMEPAGE = "https://poppler.freedesktop.org/" LICENSE = "BSD & GPLv2 & GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4870b98343f0bbb25fa43b9d2ba59448 \ - file://COPYING.adobe;md5=63c6a8a9df204c00461fa5f163d8a663 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=96287d49ec274d9c3222b5f966c132fd \ + file://COPYING.adobe;md5=a790726a74164c30b5de1ef93fd69e99 \ file://COPYING.gpl2;md5=751419260aa954499f7abaabaa882bbe \ " @@ -18,8 +18,8 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.gz \ ${CMAP_RESOURCES_BASE}/Identity-H;name=idh \ ${CMAP_RESOURCES_BASE}/Identity-V;name=idv" -SRC_URI[md5sum] = "35cc7beba00aa174631466f06732be40" -SRC_URI[sha256sum] = "1f9c7e7de9ecd0db6ab287349e31bf815ca108a5a175cf906a90163bdbe32012" +SRC_URI[md5sum] = "a7f15fb2f26c60a7a92093cfdf2378d5" +SRC_URI[sha256sum] = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30" SRC_URI[idh.md5sum] = "009c93cf0141ab7bd6acb7eea14306cc" SRC_URI[idh.sha256sum] = "ae702c203a82ea124e9b96590f821db6fbf8754e2c4547a9dba0e82f94739e95" SRC_URI[idv.md5sum] = "2f32a45d43d001c26eeac6b878855fbf" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.10.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.11.0.bb index 0f04b88f2..729923d40 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.10.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.11.0.bb @@ -7,7 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ " -SRC_URI[sha256sum] = "434ecbbb539c1a75955030a1c9b24c7b58200b7f68d2e4269e29acf2f8f13336" +SRC_URI[sha256sum] = "021557074516492375c2bb4226a413aad431159e9177f9f14dff4159d2723b14" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.7.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.8.bb index 661673d6b..336357088 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.8.bb @@ -9,11 +9,11 @@ DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi libsodium libss DEPENDS_append_libc-musl = " libexecinfo" LDFLAGS_append_libc-musl = " -lexecinfo" -SRC_URI = "https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/Remmina-v${PV}.tar.bz2 \ +SRCREV = "7ebc497062de66881b71bbe7f54dabfda0129ac2" +SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https \ " -SRC_URI[sha256sum] = "7614d447dc588403aff2ff97b253f46c5f03a6347d024618e84490b8ab4cd87b" -S = "${WORKDIR}/Remmina-v${PV}" +S = "${WORKDIR}/git" inherit cmake features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.31.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.35.bb index e99f8ac6a..c6159c42b 100644 --- a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.31.bb +++ b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.35.bb @@ -10,7 +10,7 @@ inherit autotools-brokensep python3native pkgconfig SRC_URI = "git://github.com/abrt/satyr.git \ file://0002-fix-compile-failure-against-musl-C-library.patch \ " -SRCREV = "79506592fa61fa10aa2e186158eecfa10b39e905" +SRCREV = "8690a1f83adc5a7a83e856ebc7adf6310bbd3b9f" S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" @@ -20,6 +20,7 @@ DEPENDS += " \ gperf-native \ json-c \ nettle \ + glib-2.0 \ " PACKAGES += "python3-${BPN}" diff --git a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_git.bb b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.8.1.bb index 96ec829b7..6956f5fe6 100644 --- a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.8.1.bb @@ -4,7 +4,7 @@ LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SRC_URI += "git://github.com/martinmoene/span-lite" -SRCREV = "e03d1166ccc8481d993dc02aae703966301a5e6e" +SRCREV = "937262f25fb702592cbc5c772111a73a5e3c1e07" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/files/0001-Enable-use-of-external-fmt-library.patch b/meta-openembedded/meta-oe/recipes-support/spdlog/files/0001-Enable-use-of-external-fmt-library.patch new file mode 100644 index 000000000..b62b379a7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/spdlog/files/0001-Enable-use-of-external-fmt-library.patch @@ -0,0 +1,26 @@ +From 23ce2fe30e7485d48e2864bdd8276119fbb8cbd1 Mon Sep 17 00:00:00 2001 +From: Philip Balister <philip@balister.org> +Date: Thu, 3 Dec 2020 09:22:50 -0500 +Subject: [PATCH] Enable use of external fmt library. + +Signed-off-by: Philip Balister <philip@balister.org> +--- + include/spdlog/tweakme.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/spdlog/tweakme.h b/include/spdlog/tweakme.h +index 244bc3b3..2594a6fe 100644 +--- a/include/spdlog/tweakme.h ++++ b/include/spdlog/tweakme.h +@@ -63,7 +63,7 @@ + // In this case spdlog will try to include <fmt/format.h> so set your -I flag + // accordingly. + // +-// #define SPDLOG_FMT_EXTERNAL ++#define SPDLOG_FMT_EXTERNAL + /////////////////////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////////////////// +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb index 7d28fff5e..34937c83c 100644 --- a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb @@ -4,7 +4,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRCREV = "cbe9448650176797739dbab13961ef4c07f4290f" -SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;" +SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x; \ + file://0001-Enable-use-of-external-fmt-library.patch" DEPENDS += "fmt" @@ -12,7 +13,7 @@ S = "${WORKDIR}/git" BBCLASSEXTEND = "native" # no need to build example&text&benchmarks on pure yocto -EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off -DSPDLOG_FMT_EXTERNAL=on" +EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_SHARED=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off -DSPDLOG_FMT_EXTERNAL=on" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb index 9f89bac22..3f82734ac 100644 --- a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb @@ -7,7 +7,7 @@ SECTION = "devel" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/jthornber/thin-provisioning-tools \ +SRC_URI = "git://github.com/jthornber/thin-provisioning-tools;branch=main \ file://0001-do-not-strip-pdata_tools-at-do_install.patch \ file://use-sh-on-path.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.31.bb index 93b0d6a67..803016c96 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.31.bb @@ -21,8 +21,8 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "b66ec21e0a0ac331afb4b1bc5c9ef966" -SRC_URI[sha256sum] = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8" +SRC_URI[md5sum] = "182f5cbdfb8ddbac535c04470c170dc3" +SRC_URI[sha256sum] = "9b10bc52cc31e4f76162e3975e50db26b71ab49c571d810b311ca626be5a0b26" inherit autotools-brokensep ptest pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.5.bb b/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.9.bb index 1d75d52d2..b7dcc7089 100644 --- a/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.9.bb @@ -8,8 +8,8 @@ DEPENDS += "pixman-native xorgproto-native libxrandr-native" XORG_PN = "xorg-server" SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "c9fc7e21e11286dbedd22c00df652130" -SRC_URI[sha256sum] = "a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d" +SRC_URI[md5sum] = "afcae2f46d47c33863cab7fd9db7279a" +SRC_URI[sha256sum] = "e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571" S = "${WORKDIR}/${XORG_PN}-${PV}" B = "${WORKDIR}/build" diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.7.bb index e041132b1..df75a6e81 100644 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.7.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cd6e590282010ce90a94ef25dd31410f" SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https" -SRCREV = "f5593aa11584faa691c81b4898f0aaded47f8bf7" +SRCREV = "45720028e69f09d1bec3c6a2af802ae2b06feb6e" S = "${WORKDIR}/git" DEPENDS = "\ diff --git a/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb b/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.15.bb index acd491498..41c4b76d2 100644 --- a/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb +++ b/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.15.bb @@ -9,8 +9,8 @@ SRC_URI = "${GNU_MIRROR}/zile/${BP}.tar.gz \ file://remove-help2man.patch \ " -SRC_URI[md5sum] = "c7d7eec93231c6878f255978d9747a73" -SRC_URI[sha256sum] = "7a78742795ca32480f2bab697fd5e328618d9997d6f417cf1b14e9da9af26b74" +SRC_URI[md5sum] = "05efa90dfee1821ca018b0b2ef8f50a8" +SRC_URI[sha256sum] = "39c300a34f78c37ba67793cf74685935a15568e14237a3a66fda8fcf40e3035e" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb b/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb index 5aee5ef93..e4afa43e9 100644 --- a/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb @@ -6,17 +6,19 @@ HOMEPAGE = "https://cmocka.org/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "56eb3a183fc222120f86d0c54fd033992c30135e" +SRCREV = "a4fc3dd7705c277e3a57432895e9852ea105dac9" +PV .= "+git${SRCPV}" SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git \ file://run-ptest \ - file://cmocka-uintptr_t.patch \ " S = "${WORKDIR}/git" inherit cmake ptest -EXTRA_OECMAKE = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=ON', '', d)}" +EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=ON', '', d)}" +# Use -Wl,wrap linker flag, which does not work with LTO +LTO = "" do_install_append () { install -d ${D}${datadir}/${BPN}/example @@ -27,6 +29,7 @@ do_install_append () { install -m 0755 ${B}/example/mock/chef_wrap/waiter_test_wrap ${D}/${datadir}/${BPN}/example/mock/chef_wrap install -m 0755 ${B}/example/mock/uptime/uptime ${D}/${datadir}/${BPN}/example/mock/uptime install -m 0755 ${B}/example/mock/uptime/test_uptime ${D}/${datadir}/${BPN}/example/mock/uptime + install -m 0644 ${B}/example/mock/uptime/libproc_uptime.so ${D}/${datadir}/${BPN}/example/mock/libproc_uptime.so } do_install_ptest () { @@ -37,3 +40,4 @@ do_install_ptest () { PACKAGE_BEFORE_PN += "${PN}-examples" FILES_${PN}-examples = "${datadir}/${BPN}/example" +INSANE_SKIP_${PN}-examples = "libdir" diff --git a/meta-openembedded/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch b/meta-openembedded/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch deleted file mode 100644 index 8d3b73b63..000000000 --- a/meta-openembedded/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 5bd7b5d04435bd593349825973ce32290f5f604d Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Wed, 25 Jul 2018 09:55:25 +0800 -Subject: [PATCH] samba: cmocka.h: fix musl libc conflicting types error - -Fix build on qemumips64(el) - -taken from: -[PATCH] libldb: fix musl libc conflicting types error - -/third_party/cmocka/cmocka.h:126:28: error: conflicting types for 'uintptr_t' - typedef unsigned int uintptr_t; - ^~~~~~~~~ -use __DEFINED_uintptr_t in alltypes.h to check if uintptr already defined - -Upstream-Status: Pending - -Signed-off-by: Changqing Li <changqing.li@windriver.com> -Signed-off-by: Andrea Adami <andrea.adami@gmail.com> - -Taken from [PATCH] samba: cmocka.h: fix musl libc conflicting types error -https://git.openembedded.org/meta-openembedded/commit/meta-networking/recipes-connectivity/samba?id=b758150d30a5fbdc47c465d0e9dca3a7e6d71f3c - -Signed-off-by: Armin Kuster <akuster808@gmail.com> - -This fix is not in cmocka, so pending pending?? - - -Index: git/include/cmocka.h -=================================================================== ---- git.orig/include/cmocka.h -+++ git/include/cmocka.h -@@ -116,7 +116,7 @@ typedef uintmax_t LargestIntegralType; - ((LargestIntegralType)(value)) - - /* Smallest integral type capable of holding a pointer. */ --#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) -+#if !defined(__DEFINED_uintptr_t) - # if defined(_WIN32) - /* WIN32 is an ILP32 platform */ - typedef unsigned int uintptr_t; -@@ -140,9 +140,8 @@ typedef uintmax_t LargestIntegralType; - # endif /* __WORDSIZE */ - # endif /* _WIN32 */ - --# define _UINTPTR_T --# define _UINTPTR_T_DEFINED --#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ -+# define __DEFINED_uintptr_t -+#endif /* !defined(__DEFINED_uintptr_t) */ - - /* Perform an unsigned cast to uintptr_t. */ - #define cast_to_pointer_integral_type(value) \ |