diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-28 20:16:02 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-28 20:16:02 +0300 |
| commit | da710c8bb0dea17982efc20ab4ee226a86992e6f (patch) | |
| tree | 06c83c9e85c881f40532972aaa1453298236e029 | |
| parent | 6656af78e6c7b48a1252459a61b3b72dce77ab44 (diff) | |
| parent | 2795589128d1f7509ac0ab9eba940d868413ac7d (diff) | |
| download | openbmc-da710c8bb0dea17982efc20ab4ee226a86992e6f.tar.xz | |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
411 files changed, 3541 insertions, 4725 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..85ff073f6 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,38 @@ +--- +name: Bug report +about: Create a report to help us improve our software +title: '' +labels: '' +assignees: '' + +--- + +**Note on Bugs** +Please note that questions or feature requests should be discussed on the +mailing list or IRC. Please see https://github.com/openbmc/openbmc#contact +for info on how to contact us. Github Issues in openbmc/openbmc are for bugs +only. Please remove this section when opening a bug. + +**Unexpected behavior you saw** +A clear and concise description of what unexpectedly happened. + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**OpenBMC Information:** + - /etc/os-release: + - uname -a: + - Any additional patches or changes: + +**Additional context** +Add any other context about the problem here. diff --git a/meta-aspeed/README.md b/meta-aspeed/README.md index 6c3221ef9..b97bbc78d 100644 --- a/meta-aspeed/README.md +++ b/meta-aspeed/README.md @@ -1,9 +1,36 @@ -ASPEED -================ - -This is the ASPEED Board Support Package (BSP) layer. It supports the -AST2400 and AST2500; ARM service management SOCs made by ASPEED. More -information about the AST2400 and AST2500 can be found -[here](https://www.aspeedtech.com/products.php?fPath=20&rId=376) -and -[here](https://www.aspeedtech.com/products.php?fPath=20&rId=440). +OpenEmbedded/Yocto BSP layer for Aspeed's platforms +====================================================================== + +This layer provides support for Aspeed's platforms for use with OpenEmbedded +and/or Yocto. + +``` +This layer depends on: + +URI: git://git.openembedded.org/openembedded-core +layers: meta +branch: master +revision: HEAD +``` + +Contributing +------------ + +meta-aspeed patches are reviewed using the Gerrit instance at +https://gerrit.openbmc-project.xyz. + +Please submit patches to Gerrit. More information on using Gerrit can be found +[here](https://github.com/openbmc/docs/blob/master/CONTRIBUTING.md#submitting-changes-via-gerrit-server). +https://github.com/openbmc/meta-aspeed is a hosting mirror only and GitHub +pull requests are not monitored and will not be accepted. + +Patch checklist. Please ensure patches adhere to the following guidelines: + + - meta-aspeed uses the [OE style + guidelines](https://www.openembedded.org/wiki/Styleguide). + - follow [the seven rules of a great git commit + message](https://chris.beams.io/posts/git-commit/#seven-rules) + +For questions or help please come join us on the [mailing +list](https://lists.ozlabs.org/listinfo/openbmc) or in +[IRC](irc://freenode.net/openbmc). diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc index 946eebccd..05e465849 100644 --- a/meta-aspeed/conf/machine/include/aspeed.inc +++ b/meta-aspeed/conf/machine/include/aspeed.inc @@ -13,7 +13,7 @@ KERNEL_CLASSES ?= "kernel-fitimage" INITRAMFS_IMAGE ?= "aspeed-image-initramfs" INITRAMFS_FSTYPES ?= "cpio.xz" -MACHINE_EXTRA_RRECOMMENDS += "udev-aspeed-vuart" +MACHINE_EXTRA_RRECOMMENDS += "udev-aspeed-vuart udev-aspeed-mtd-partitions" MACHINEOVERRIDES =. "aspeed:" diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index da191586e..43800a178 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.3" -LINUX_VERSION ?= "5.3.6" +LINUX_VERSION ?= "5.3.7" -SRCREV="62d45cc8d76110a9e8e9107ff91420e89ef01681" +SRCREV="b172fa10db70d01b3f9626209decd8b10e6aafd0" require linux-aspeed.inc diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/meta-tiogapass/recipes-fbtp/ipmi/fb-ipmi-oem_git.bb index 7f2ecf6a8..1601b16f6 100755 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/meta-tiogapass/recipes-fbtp/ipmi/fb-ipmi-oem_git.bb @@ -21,6 +21,9 @@ LIBRARY_NAMES = "libzfboemcmds.so" HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" NETIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" +FILES_${PN}_append = " ${datadir}/ipmi-providers/post_desc.json" +FILES_${PN}_append = " ${datadir}/ipmi-providers/gpio_desc.json" + FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}" diff --git a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf index 81d808a7b..628a45a22 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf @@ -1,7 +1,6 @@ KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb" UBOOT_MACHINE = "evb-ast2600_defconfig" -MACHINEOVERRIDES =. "ibm-ac-server:witherspoon:" require conf/machine/include/ast2600.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc @@ -22,3 +21,4 @@ PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ "phosphor-fan-presence-config" FLASH_SIZE = "131072" +SKIP_BROKEN_MRW = "1" diff --git a/meta-ibm/meta-witherspoon/conf/machine/swift.conf b/meta-ibm/meta-witherspoon/conf/machine/swift.conf index 3915e2b98..4c0abb57d 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/swift.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/swift.conf @@ -1,6 +1,6 @@ require conf/machine/witherspoon.conf -IMAGE_FSTYPES += "ext4" +IMAGE_FSTYPES += "ext4 mmc-ext4-tar" KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend index a40f61873..500c91df5 100644 --- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend @@ -3,12 +3,25 @@ SRC_URI_append_ibm-ac-server = " file://journald-storage-policy.conf" SRC_URI_append_ibm-ac-server = " file://systemd-journald-override.conf" SRC_URI_append_ibm-ac-server = " file://journald-size-policy.conf" +SRC_URI_append_rainier = " file://journald-storage-policy.conf" +SRC_URI_append_rainier = " file://systemd-journald-override.conf" +SRC_URI_append_rainier = " file://journald-size-policy.conf" + FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" FILES_${PN}_append_ibm-ac-server = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" +FILES_${PN}_append_rainier = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" +FILES_${PN}_append_rainier = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" +FILES_${PN}_append_rainier = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" + do_install_append_ibm-ac-server() { install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf install -m 644 -D ${WORKDIR}/journald-size-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf } +do_install_append_rainier() { + install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf + install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf + install -m 644 -D ${WORKDIR}/journald-size-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf +} diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/rainier.cfg b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/rainier.cfg new file mode 100644 index 000000000..dc41d5834 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/rainier.cfg @@ -0,0 +1,7 @@ +CONFIG_SENSORS_IIO_HWMON=y +CONFIG_SENSORS_TMP421=y +CONFIG_SENSORS_MAX31785=y +CONFIG_SENSORS_UCD9000=y +CONFIG_RTC_DRV_RV8803=y +CONFIG_IIO=y +CONFIG_BMP280=y diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend index 6f9a382ac..30df8a8a3 100644 --- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,4 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_ibm-ac-server = " file://witherspoon.cfg" +SRC_URI_append_rainier = " file://rainier.cfg" SRC_URI_append_mihawk = " file://mihawk.cfg" SRC_URI_append_witherspoon-128 = " file://0001-ARM-dts-Aspeed-Add-witherspoon-128-machine.patch" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb index 5371c3a09..5ec7d4565 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb @@ -50,18 +50,19 @@ do_install() { # generate extra-properties.yaml from the MRW for ipmi-fru-parser $perlbin $scriptpath/gen_fru_properties.pl -m $mrw \ -c $op_configpath/ipmi-fru-properties-mrw.yaml \ - -o extra-properties.yaml + -o extra-properties.yaml ${EXTRA_MRW_SCRIPT_ARGS} # generate fru-read.yaml from the MRW, for ipmid and ipmi-fru-parser $perlbin $scriptpath/gen_ipmi_fru.pl -i $mrw \ -m $op_configpath/ipmi-hostboot-fru-mrw.yaml \ - -o fru-read-partial.yaml + -o fru-read-partial.yaml ${EXTRA_MRW_SCRIPT_ARGS} cat fru-read-partial.yaml ${ACx22_IPMI_EXTRA_FRU_READ_YAMLS} \ > fru-read.yaml # generate inventory-sensors.yaml from the MRW, for ipmid $perlbin $scriptpath/gen_ipmi_sel.pl -i $mrw \ - -m acx22-ipmi-inventory-sensors.yaml -o inventory-sensors.yaml + -m acx22-ipmi-inventory-sensors.yaml -o inventory-sensors.yaml \ + ${EXTRA_MRW_SCRIPT_ARGS} # generate sensors.yaml from the MRW, for ipmid cat acx22-ipmi-sensors-mrw.yaml \ @@ -69,7 +70,7 @@ do_install() { $op_configpath/ipmi-occ-active-sensor-mrw.yaml \ > sensors-mrw.yaml $perlbin $scriptpath/gen_ipmi_sensor.pl -i $mrw -m sensors-mrw.yaml \ - -o sensors-partial.yaml + -o sensors-partial.yaml ${EXTRA_MRW_SCRIPT_ARGS} cat sensors-partial.yaml ${ACx22_IPMI_EXTRA_SENSOR_YAMLS} \ > sensors.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml index 5534cb6cd..c1902d02b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml @@ -297,6 +297,19 @@ actions: - property - defevents - altevents + - name: update_default_floor + description: > + Update the default fan floor to the given speed + parameters: + - property + - speed + - name: use_events_on_state + description: > + Use a set of events when all the group properties are at a given + state, otherwise remove the events + parameters: + - property + - events events: - name: default_fan_floor_on_service_fail @@ -358,6 +371,222 @@ events: speed: value: 10500 type: uint64_t + - name: set_speed_boundaries_based_on_ambient + groups: + - name: zone0_control_mode + interface: xyz.openbmc_project.Control.ThermalMode + property: + name: Current + type: std::string + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty + actions: + - name: update_default_floor + property: + value: DEFAULT + type: std::string + speed: + value: 8000 + type: uint64_t + - name: update_default_floor + property: + value: CUSTOM + type: std::string + speed: + value: 8000 + type: uint64_t + - name: update_default_floor + property: + value: HEAVY_IO + type: std::string + speed: + value: 10500 + type: uint64_t + - name: update_default_floor + property: + value: MAX_BASE_FAN_FLOOR + type: std::string + speed: + value: 10500 + type: uint64_t + - name: use_events_on_state + property: + value: DEFAULT + type: std::string + events: + - name: default_fan_speed_boundaries + groups: + - name: zone0_ambient + zone_conditions: + - name: air_cooled_chassis + zones: + - 0 + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty + actions: + - name: set_floor_from_average_sensor_value + map: + value: + - 27000: 3500 + - 32000: 4600 + - 37000: 5200 + - 40000: 5800 + type: std::map<int64_t, uint64_t> + - name: set_ceiling_from_average_sensor_value + map: + value: + - 25000: 7200 + - 27000: 10500 + type: std::map<int64_t, uint64_t> + - name: default_fan_speed_boundaries + groups: + - name: zone0_ambient + zone_conditions: + - name: water_and_air_cooled_chassis + zones: + - 0 + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty + actions: + - name: set_floor_from_average_sensor_value + map: + value: + - 27000: 3000 + - 32000: 4300 + - 37000: 5000 + - 40000: 5800 + type: std::map<int64_t, uint64_t> + - name: set_ceiling_from_average_sensor_value + map: + value: + - 25000: 7200 + - 27000: 10500 + type: std::map<int64_t, uint64_t> + - name: use_events_on_state + property: + value: CUSTOM + type: std::string + events: + - name: custom_fan_speed_boundaries + groups: + - name: zone0_ambient + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty + actions: + - name: set_floor_from_average_sensor_value + map: + value: + - 27000: 4600 + - 32000: 5000 + - 37000: 5400 + - 40000: 5800 + type: std::map<int64_t, uint64_t> + - name: set_ceiling_from_average_sensor_value + map: + value: + - 25000: 7200 + - 27000: 10500 + type: std::map<int64_t, uint64_t> + - name: use_events_on_state + property: + value: HEAVY_IO + type: std::string + events: + - name: heavy_io_fan_speed_boundaries + groups: + - name: zone0_ambient + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty + actions: + - name: set_floor_from_average_sensor_value + map: + value: + - 27000: 5900 + - 32000: 6800 + - 37000: 7500 + - 40000: 8200 + type: std::map<int64_t, uint64_t> + - name: set_ceiling_from_average_sensor_value + map: + value: + - 25000: 7200 + - 27000: 10500 + type: std::map<int64_t, uint64_t> + - name: use_events_on_state + property: + value: MAX_BASE_FAN_FLOOR + type: std::string + events: + - name: max_base_fan_floor_fan_speed_boundaries + groups: + - name: zone0_ambient + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty + actions: + - name: set_floor_from_average_sensor_value + map: + value: + - 27000: 7200 + - 32000: 8800 + - 37000: 9600 + - 40000: 10500 + type: std::map<int64_t, uint64_t> + - name: set_ceiling_from_average_sensor_value + map: + value: + - 25000: 7200 + - 27000: 10500 + type: std::map<int64_t, uint64_t> - name: full_speed_at_power_on precondition: name: property_states_match @@ -448,130 +677,6 @@ events: speed: value: 10500 type: uint64_t - - name: set_air_cooled_speed_boundaries_based_on_ambient - groups: - - name: zone0_control_mode - zone_conditions: - - name: air_cooled_chassis - zones: - - 0 - interface: xyz.openbmc_project.Control.ThermalMode - property: - name: Current - type: std::string - triggers: - - name: init - method: getProperties - handler: setProperty - - name: signal - signal: propertiesChanged - handler: setProperty - actions: - - name: use_alternate_events_on_state - property: - value: CUSTOM - type: std::string - defevents: - - name: default_floor_boundary - groups: - - name: zone0_ambient - zone_conditions: - - name: air_cooled_chassis - zones: - - 0 - interface: xyz.openbmc_project.Sensor.Value - property: - name: Value - type: int64_t - triggers: - - name: init - method: getProperties - handler: setProperty - - name: signal - signal: propertiesChanged - handler: setProperty - actions: - - name: set_floor_from_average_sensor_value - map: - value: - - 27000: 3500 - - 32000: 4600 - - 37000: 5200 - - 40000: 5800 - type: std::map<int64_t, uint64_t> - - name: set_ceiling_from_average_sensor_value - map: - value: - - 25000: 7200 - - 27000: 10500 - type: std::map<int64_t, uint64_t> - altevents: - - name: alternate_floor_boundary - groups: - - name: zone0_ambient - zone_conditions: - - name: air_cooled_chassis - zones: - - 0 - interface: xyz.openbmc_project.Sensor.Value - property: - name: Value - type: int64_t - triggers: - - name: init - method: getProperties - handler: setProperty - - name: signal - signal: propertiesChanged - handler: setProperty - actions: - - name: set_floor_from_average_sensor_value - map: - value: - - 27000: 4600 - - 32000: 5000 - - 37000: 5400 - - 40000: 5800 - type: std::map<int64_t, uint64_t> - - name: set_ceiling_from_average_sensor_value - map: - value: - - 25000: 7200 - - 27000: 10500 - type: std::map<int64_t, uint64_t> - - name: set_water_cooled_speed_boundaries_based_on_ambient - groups: - - name: zone0_ambient - zone_conditions: - - name: water_and_air_cooled_chassis - zones: - - 0 - interface: xyz.openbmc_project.Sensor.Value - property: - name: Value - type: int64_t - triggers: - - name: init - method: getProperties - handler: setProperty - - name: signal - signal: propertiesChanged - handler: setProperty - actions: - - name: set_floor_from_average_sensor_value - map: - value: - - 27000: 3000 - - 32000: 4300 - - 37000: 5000 - - 40000: 5800 - type: std::map<int64_t, uint64_t> - - name: set_ceiling_from_average_sensor_value - map: - value: - - 25000: 7200 - - 27000: 10500 - type: std::map<int64_t, uint64_t> - name: occ_active_speed_changes precondition: name: property_states_match diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml index d31b30445..63303d7c0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml @@ -28,9 +28,19 @@ zone_configuration: - value: CUSTOM description: > Custom thermal control mode for handling the use of - optical cables located behind the GPU exhaust that - could produce overtemp warnings without this mode - enabled. + PCI cards located behind the GPU exhaust that + could overtemp where the default mode is not + sufficient enough. + - value: HEAVY_IO + description: > + Heavy IO thermal control mode for handling the use + of PCI cards that produce heavy IO utilization and + could overtemp. + - value: MAX_BASE_FAN_FLOOR + description: > + Maximum base fan floor mode is for handling the + use of any hardware that requires the highest + amount of cooling even when the system may be idle. - name: Current type: string persist: true @@ -63,11 +73,28 @@ zone_configuration: - value: DEFAULT description: > Default thermal control mode + - value: CUSTOM + description: > + Custom thermal control mode for handling the use of + PCI cards located behind the GPU exhaust that + could overtemp where the default mode is not + sufficient enough. + - value: HEAVY_IO + description: > + Heavy IO thermal control mode for handling the use + of PCI cards that produce heavy IO utilization and + could overtemp. + - value: MAX_BASE_FAN_FLOOR + description: > + Maximum base fan floor mode is for handling the + use of any hardware that requires the highest + amount of cooling even when the system may be idle. - name: Current type: string persist: true values: - - value: DEFAULT - description: > - Set current thermal control mode to the - default. No other modes are supported. + - value: DEFAULT + description: > + Set current thermal control mode to the + default which will be replaced on startup if + another selected mode was persisted. diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index 61a99fd1a..61297c12c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1,12 +1,16 @@ BMC_RW_MTD_ibm-ac-server = "bmc" +BMC_RW_MTD_rainier = "bmc" BMC_RW_MTD_mihawk = "bmc" BMC_RO_MTD_ibm-ac-server = "alt-bmc+bmc" +BMC_RO_MTD_rainier = "bmc" BMC_RO_MTD_mihawk = "alt-bmc+bmc" BMC_KERNEL_MTD_ibm-ac-server = "bmc" +BMC_KERNEL_MTD_rainier = "bmc" BMC_KERNEL_MTD_mihawk = "bmc" # Enable signature verification PACKAGECONFIG_append_ibm-ac-server = " verify_signature" +PACKAGECONFIG_append_rainier = " verify_signature" PACKAGECONFIG_append_mihawk = " verify_signature" # Enable sync of persistent files to the alternate BMC chip diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend index a698b06ad..423a9e4a1 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend @@ -5,4 +5,5 @@ RDEPENDS_${PN}_remove_ibm-ac-server = "p9-vcs-workaround" RDEPENDS_${PN}_append_mihawk = " avsbus-control" RDEPENDS_${PN}_append_mihawk = " vrm-control" RDEPENDS_${PN}_remove_mihawk = "p9-vcs-workaround" +RDEPENDS_${PN}_remove_rainier = "p9-vcs-workaround" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend index c66cc4efc..562679222 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,2 +1,3 @@ OBMC_IMAGE_EXTRA_INSTALL_append_ibm-ac-server = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-mac first-boot-set-hostname" +OBMC_IMAGE_EXTRA_INSTALL_append_rainier = " mboxd" OBMC_IMAGE_EXTRA_INSTALL_append_mihawk = " mboxd liberation-fonts uart-render-controller first-boot-set-mac" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json new file mode 100644 index 000000000..7f26c247e --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json @@ -0,0 +1,178 @@ +{ + "0" : { + "name" : "IPMB", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "ipmb", + "protocol_type" : "ipmb-1.0", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "1" : { + "name" : "eth0", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "lan-802.3", + "protocol_type" : "ipmb-1.0", + "session_supported" : "multi-session", + "is_ipmi" : true + } + }, + "2" : { + "name" : "eth1", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "lan-802.3", + "protocol_type" : "ipmb-1.0", + "session_supported" : "multi-session", + "is_ipmi" : true + } + }, + "3" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "4" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "5" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "6" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "7" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "8" : { + "name" : "INTRABMC", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "oem", + "protocol_type" : "oem", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "9" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "10" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "11" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "12" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "13" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "14" : { + "name" : "SELF", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "ipmb", + "protocol_type" : "ipmb-1.0", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "15" : { + "name" : "SMS", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "system-interface", + "protocol_type" : "kcs", + "session_supported" : "session-less", + "is_ipmi" : true + } + } +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json new file mode 100644 index 000000000..cd72656e2 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json @@ -0,0 +1,59 @@ +{ + "inlet": [ + {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/ambient_temp", "record_id": 255} + ], + "baseboard": [ + {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_pcie_temp", "record_id": 253} + {"instance": 2, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_pcie_temp", "record_id": 254} + ], + "cpu": [ + {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core0_temp", "record_id": 17}, + {"instance": 2, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core1_temp", "record_id": 20}, + {"instance": 3, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core2_temp", "record_id": 23}, + {"instance": 4, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core3_temp", "record_id": 26}, + {"instance": 5, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core4_temp", "record_id": 29}, + {"instance": 6, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core5_temp", "record_id": 32}, + {"instance": 7, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core6_temp", "record_id": 35}, + {"instance": 8, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core7_temp", "record_id": 38}, + {"instance": 9, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core8_temp", "record_id": 41}, + {"instance": 10, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core9_temp", "record_id": 44}, + {"instance": 11, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core10_temp", "record_id": 47}, + {"instance": 12, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core11_temp", "record_id": 50}, + {"instance": 13, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core12_temp", "record_id": 53}, + {"instance": 14, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core13_temp", "record_id": 56}, + {"instance": 15, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core14_temp", "record_id": 59}, + {"instance": 16, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core15_temp", "record_id": 62}, + {"instance": 17, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core16_temp", "record_id": 65}, + {"instance": 18, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core17_temp", "record_id": 68}, + {"instance": 19, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core18_temp", "record_id": 71}, + {"instance": 20, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core19_temp", "record_id": 74}, + {"instance": 21, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core20_temp", "record_id": 77}, + {"instance": 22, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core21_temp", "record_id": 80}, + {"instance": 23, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core22_temp", "record_id": 83}, + {"instance": 24, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core23_temp", "record_id": 86}, + {"instance": 25, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core0_temp", "record_id": 91}, + {"instance": 26, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core1_temp", "record_id": 94}, + {"instance": 27, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core2_temp", "record_id": 97}, + {"instance": 28, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core3_temp", "record_id": 100}, + {"instance": 29, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core4_temp", "record_id": 103}, + {"instance": 30, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core5_temp", "record_id": 106}, + {"instance": 31, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core6_temp", "record_id": 109}, + {"instance": 32, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core7_temp", "record_id": 112}, + {"instance": 33, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core8_temp", "record_id": 115}, + {"instance": 34, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core9_temp", "record_id": 118}, + {"instance": 35, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core10_temp", "record_id": 121}, + {"instance": 36, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core11_temp", "record_id": 124}, + {"instance": 37, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core12_temp", "record_id": 127}, + {"instance": 38, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core13_temp", "record_id": 130}, + {"instance": 39, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core14_temp", "record_id": 133}, + {"instance": 40, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core15_temp", "record_id": 136}, + {"instance": 41, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core16_temp", "record_id": 139}, + {"instance": 42, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core17_temp", "record_id": 142}, + {"instance": 43, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core18_temp", "record_id": 145}, + {"instance": 44, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core19_temp", "record_id": 148}, + {"instance": 45, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core20_temp", "record_id": 151}, + {"instance": 46, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core21_temp", "record_id": 154}, + {"instance": 47, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core22_temp", "record_id": 157}, + {"instance": 48, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core23_temp", "record_id": 160} + ] +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json new file mode 100644 index 000000000..97e8f32b5 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json @@ -0,0 +1,3 @@ +{ + "path": "/xyz/openbmc_project/sensors/power/total_power" +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend index 5e2dc6c20..9dff37d10 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -1 +1,2 @@ PACKAGECONFIG_append_witherspoon-128 = " openpower-pels" +PACKAGECONFIG_append_rainier = " openpower-pels" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend index 9ead95927..e23d8fa45 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend @@ -1,5 +1,6 @@ MBOXD_FLASH_SIZE_ibm-ac-server = "64M" MBOXD_FLASH_SIZE_mihawk = "64M" +MBOXD_FLASH_SIZE_rainier = "64M" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service b/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service index 44b34195e..890551e7a 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service @@ -1,7 +1,6 @@ [Unit] Description=Stop the ethernet link failover -Wants=xyz.openbmc_project.Network.service -After=xyz.openbmc_project.Network.service +After=network.service [Service] Restart=no diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend index ba6e393bb..bcb2d0136 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,8 +1,15 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/network:" SRC_URI_append_ibm-ac-server = " file://ncsi-netlink.service" +SRC_URI_append_mihawk = " file://ncsi-netlink.service" + SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " ncsi-netlink.service" +SYSTEMD_SERVICE_${PN}_append_mihawk = " ncsi-netlink.service" do_install_append_ibm-ac-server() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir} } +do_install_append_mihawk() { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir} +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index c75c7d0f9..005dd0c66 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,9 +1,11 @@ RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" +RDEPENDS_${PN}-inventory_append_rainier = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type" RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " witherspoon-fan-watchdog" RDEPENDS_${PN}-extras_append_ibm-ac-server = " witherspoon-pfault-analysis witherspoon-power-supply-sync phosphor-webui" +RDEPENDS_${PN}-extras_append_rainier = " phosphor-webui" RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing" RDEPENDS_${PN}-extras_remove_rainier = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller" - +RDEPENDS_${PN}-logging_remove_rainier = "ibm-logging" ${PN}-software-extras_append_ibm-ac-server = " phosphor-software-manager-sync" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml index d23ce58fb..e40e8dd7c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml @@ -198,3 +198,13 @@ pinID: 83 poll: false analysis: none + GPIOAnalysis: + - type: none + path: "" + gpio_value: low + error_function: memGoodError + option_flags: none + GPIODefinitions: + - GPIODefinition: none + gpio: 0 + callout: "" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc index 0612d62af..c3ef3e460 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "b3853e2d3ac295a961e08927d177b40ddd683914" +SRCREV = "bd4b86d3982cd5592e0417a5e45be6d3083f4c81" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb index 0645eb7a7..49fe344dc 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb @@ -19,9 +19,10 @@ DEPENDS += " \ sdbus++-native \ sdeventplus \ power-sequencer \ + nlohmann-json \ " -EXTRA_OECONF = "UCD90160_DEF_YAML_FILE=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" +EXTRA_OEMESON += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" CHASSIS_ON_TGT = "obmc-chassis-poweron@0.target" SEQ_MONITOR_SVC = "pseq-monitor.service" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf index 5b347c10c..5b347c10c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf index ba53cd95d..ba53cd95d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf index 5582e9dbf..5582e9dbf 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf index 1cc4afb71..1cc4afb71 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf new file mode 100644 index 000000000..cdf8b4726 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf @@ -0,0 +1,6 @@ +LABEL_temp1 = "ambient" +WARNHI_temp1 = "25000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "35000" +CRITLO_temp1 = "0" +OFFSET_temp1 = "-2000" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf new file mode 100644 index 000000000..cdf8b4726 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf @@ -0,0 +1,6 @@ +LABEL_temp1 = "ambient" +WARNHI_temp1 = "25000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "35000" +CRITLO_temp1 = "0" +OFFSET_temp1 = "-2000" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf new file mode 100644 index 000000000..d3df21599 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf @@ -0,0 +1,17 @@ +LABEL_fan1 = "fan0_0" + +LABEL_fan2 = "fan1_0" + +LABEL_fan3 = "fan2_0" + +LABEL_fan4 = "fan3_0" + +LABEL_fan5 = "fan0_1" + +LABEL_fan6 = "fan1_1" + +LABEL_fan7 = "fan2_1" + +LABEL_fan8 = "fan3_1" + +TARGET_MODE = "RPM" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf new file mode 100644 index 000000000..c96bfa76b --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf @@ -0,0 +1,13 @@ +LABEL_fan1 = "fan0_0" + +LABEL_fan3 = "fan2_0" + +LABEL_fan4 = "fan3_0" + +LABEL_fan5 = "fan0_1" + +LABEL_fan7 = "fan2_1" + +LABEL_fan8 = "fan3_1" + +TARGET_MODE = "RPM" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf new file mode 100644 index 000000000..e463b517c --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf @@ -0,0 +1,23 @@ +LABEL_in1="ps1_input_voltage" +WARNHI_in1="290000" +WARNLO_in1="200000" +CRITHI_in1="300000" +CRITLO_in1="180000" + +LABEL_in2="ps1_output_voltage" +WARNHI_in2="12700" +WARNLO_in2="0" +CRITHI_in2="13000" +CRITLO_in2="0" + +LABEL_curr1="ps1_output_current" +WARNHI_curr1="170000" +WARNLO_curr1="0" +CRITHI_curr1="180000" +CRITLO_curr1="0" + +LABEL_power1="ps1_input_power" +WARNHI_power1="2350000000" +WARNLO_power1="0" +CRITHI_power1="2500000000" +CRITLO_power1="0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf new file mode 100644 index 000000000..2fadbdec0 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf @@ -0,0 +1,23 @@ +LABEL_in1="ps0_input_voltage" +WARNHI_in1="290000" +WARNLO_in1="200000" +CRITHI_in1="300000" +CRITLO_in1="180000" + +LABEL_in2="ps0_output_voltage" +WARNHI_in2="12700" +WARNLO_in2="0" +CRITHI_in2="13000" +CRITLO_in2="0" + +LABEL_curr1="ps0_output_current" +WARNHI_curr1="170000" +WARNLO_curr1="0" +CRITHI_curr1="180000" +CRITLO_curr1="0" + +LABEL_power1="ps0_input_power" +WARNHI_power1="2350000000" +WARNLO_power1="0" +CRITHI_power1="2500000000" +CRITLO_power1="0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf new file mode 100644 index 000000000..c5344aeb6 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf @@ -0,0 +1,65 @@ +#4-0070 +#VDD then VCS + +MODE_in1 = "label" +MODE_in2 = "label" +MODE_in3 = "label" +MODE_in4 = "label" + +MODE_curr1 = "label" +MODE_curr2 = "label" +MODE_curr3 = "label" +MODE_curr4 = "label" + +MODE_power1 = "label" +MODE_power2 = "label" +MODE_power3 = "label" +MODE_power4 = "label" + +LABEL_temp1 = "p0_vdd_temp" +WARNHI_temp1 = "80000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "85000" +CRITLO_temp1 = "0" + +LABEL_curriout1 = "p0_vdd_current" +WARNLO_curriout1 = "0" +CRITLO_curriout1 = "0" +WARNHI_curriout1 = "320000" +CRITHI_curriout1 = "360000" + +LABEL_invout1 = "p0_vdd_voltage" +WARNLO_invout1 = "0" +CRITLO_invout1 = "0" +WARNHI_invout1 = "1150" +CRITHI_invout1 = "1300" + +LABEL_powerpout1 = "p0_vdd_power" +WARNLO_powerpout1 = "0" +CRITLO_powerpout1 = "0" +WARNHI_powerpout1 = "270000000" +CRITHI_powerpout1 = "290000000" + +LABEL_temp2 = "p0_vcs_temp" +WARNHI_temp2 = "80000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "85000" +CRITLO_temp2 = "0" + +LABEL_curriout2 = "p0_vcs_current" +WARNLO_curriout2 = "0" +CRITLO_curriout2 = "0" +WARNHI_curriout2 = "20000" +CRITHI_curriout2 = "25000" + +LABEL_invout2 = "p0_vcs_voltage" +WARNLO_invout2 = "0" +CRITLO_invout2 = "0" +WARNHI_invout2 = "1150" +CRITHI_invout2 = "1300" + +LABEL_powerpout2 = "p0_vcs_power" +WARNLO_powerpout2 = "0" +CRITLO_powerpout2 = "0" +WARNHI_powerpout2 = "20000000" +CRITHI_powerpout2 = "25000000" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf new file mode 100644 index 000000000..23746aa11 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf @@ -0,0 +1,65 @@ +#4-0071 +#VDN then VDDR + +MODE_in1 = "label" +MODE_in2 = "label" +MODE_in3 = "label" +MODE_in4 = "label" + +MODE_curr1 = "label" +MODE_curr2 = "label" +MODE_curr3 = "label" +MODE_curr4 = "label" + +MODE_power1 = "label" +MODE_power2 = "label" +MODE_power3 = "label" +MODE_power4 = "label" + +LABEL_temp1 = "p0_vdn_temp" +WARNHI_temp1 = "80000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "85000" +CRITLO_temp1 = "0" + +LABEL_curriout1 = "p0_vdn_current" +WARNLO_curriout1 = "0" +CRITLO_curriout1 = "0" +WARNHI_curriout1 = "80000" +CRITHI_curriout1 = "110000" + +LABEL_invout1 = "p0_vdn_voltage" +WARNLO_invout1 = "0" +CRITLO_invout1 = "0" +WARNHI_invout1 = "1100" +CRITHI_invout1 = "1300" + +LABEL_powerpout1 = "p0_vdn_power" +WARNLO_powerpout1 = "0" +CRITLO_powerpout1 = "0" +WARNHI_powerpout1 = "88000000" +CRITHI_powerpout1 = "121000000" + +LABEL_temp2 = "p0_vddr_temp" +WARNHI_temp2 = "80000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "85000" +CRITLO_temp2 = "0" + +LABEL_curriout2 = "p0_vddr_current" +WARNLO_curriout2 = "0" +CRITLO_curriout2 = "0" +WARNHI_curriout2 = "115000" +CRITHI_curriout2 = "130000" + +LABEL_invout2 = "p0_vddr_voltage" +WARNLO_invout2 = "0" +CRITLO_invout2 = "0" +WARNHI_invout2 = "1280" +CRITHI_invout2 = "1350" + +LABEL_powerpout2 = "p0_vddr_power" +WARNLO_powerpout2 = "0" +CRITLO_powerpout2 = "0" +WARNHI_powerpout2 = "139150000" +CRITHI_powerpout2 = "159900000" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf new file mode 100644 index 000000000..e7d8aaf23 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf @@ -0,0 +1,65 @@ +#5-0070 +#VDD then VCS + +MODE_in1 = "label" +MODE_in2 = "label" +MODE_in3 = "label" +MODE_in4 = "label" + +MODE_curr1 = "label" +MODE_curr2 = "label" +MODE_curr3 = "label" +MODE_curr4 = "label" + +MODE_power1 = "label" +MODE_power2 = "label" +MODE_power3 = "label" +MODE_power4 = "label" + +LABEL_temp1 = "p1_vdd_temp" +WARNHI_temp1 = "80000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "85000" +CRITLO_temp1 = "0" + +LABEL_curriout1 = "p1_vdd_current" +WARNLO_curriout1 = "0" +CRITLO_curriout1 = "0" +WARNHI_curriout1 = "320000" +CRITHI_curriout1 = "360000" + +LABEL_invout1 = "p1_vdd_voltage" +WARNLO_invout1 = "0" +CRITLO_invout1 = "0" +WARNHI_invout1 = "1150" +CRITHI_invout1 = "1300" + +LABEL_powerpout1 = "p1_vdd_power" +WARNLO_powerpout1 = "0" +CRITLO_powerpout1 = "0" +WARNHI_powerpout1 = "270000000" +CRITHI_powerpout1 = "290000000" + +LABEL_temp2 = "p1_vcs_temp" +WARNHI_temp2 = "80000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "85000" +CRITLO_temp2 = "0" + +LABEL_curriout2 = "p1_vcs_current" +WARNLO_curriout2 = "0" +CRITLO_curriout2 = "0" +WARNHI_curriout2 = "20000" +CRITHI_curriout2 = "25000" + +LABEL_invout2 = "p1_vcs_voltage" +WARNLO_invout2 = "0" +CRITLO_invout2 = "0" +WARNHI_invout2 = "1150" +CRITHI_invout2 = "1300" + +LABEL_powerpout2 = "p1_vcs_power" +WARNLO_powerpout2 = "0" +CRITLO_powerpout2 = "0" +WARNHI_powerpout2 = "20000000" +CRITHI_powerpout2 = "25000000" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf new file mode 100644 index 000000000..30ec05dbb --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf @@ -0,0 +1,65 @@ +#5-0071 +#VDN then VDDR + +MODE_in1 = "label" +MODE_in2 = "label" +MODE_in3 = "label" +MODE_in4 = "label" + +MODE_curr1 = "label" +MODE_curr2 = "label" +MODE_curr3 = "label" +MODE_curr4 = "label" + +MODE_power1 = "label" +MODE_power2 = "label" +MODE_power3 = "label" +MODE_power4 = "label" + +LABEL_temp1 = "p1_vdn_temp" +WARNHI_temp1 = "80000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "85000" +CRITLO_temp1 = "0" + +LABEL_curriout1 = "p1_vdn_current" +WARNLO_curriout1 = "0" +CRITLO_curriout1 = "0" +WARNHI_curriout1 = "80000" +CRITHI_curriout1 = "110000" + +LABEL_invout1 = "p1_vdn_voltage" +WARNLO_invout1 = "0" +CRITLO_invout1 = "0" +WARNHI_invout1 = "1100" +CRITHI_invout1 = "1300" + +LABEL_powerpout1 = "p1_vdn_power" +WARNLO_powerpout1 = "0" +CRITLO_powerpout1 = "0" +WARNHI_powerpout1 = "88000000" +CRITHI_powerpout1 = "121000000" + +LABEL_temp2 = "p1_vddr_temp" +WARNHI_temp2 = "80000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "85000" +CRITLO_temp2 = "0" + +LABEL_curriout2 = "p1_vddr_current" +WARNLO_curriout2 = "0" +CRITLO_curriout2 = "0" +WARNHI_curriout2 = "115000" +CRITHI_curriout2 = "130000" + +LABEL_invout2 = "p1_vddr_voltage" +WARNLO_invout2 = "0" +CRITLO_invout2 = "0" +WARNHI_invout2 = "1280" +CRITHI_invout2 = "1350" + +LABEL_powerpout2 = "p1_vddr_power" +WARNLO_powerpout2 = "0" +CRITLO_powerpout2 = "0" +WARNHI_powerpout2 = "139150000" +CRITHI_powerpout2 = "159900000" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf new file mode 100644 index 000000000..3af092867 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf @@ -0,0 +1,5 @@ +LABEL_temp1 = "pcie" +WARNHI_temp1 = "60000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "70000" +CRITLO_temp1 = "0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf index c5fa56f65..c5fa56f65 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf index 55b72fc2a..55b72fc2a 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 4d60a74c2..36029dd72 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -8,13 +8,11 @@ SRC_URI_append_ibm-ac-server = " \ file://start_max31785_hwmon.sh \ " -CHIPS = " \ - bus@1e78a000/i2c-bus@100/max31785@52_air \ - bus@1e78a000/i2c-bus@100/max31785@52_water \ - bus@1e78a000/i2c-bus@100/power-supply@68 \ - bus@1e78a000/i2c-bus@100/power-supply@69 \ - " -CHIPS_append_witherspoon = " \ +CHIPS_witherspoon = " \ + bus@1e78a000/i2c-bus@100/max31785@52_air \ + bus@1e78a000/i2c-bus@100/max31785@52_water \ + bus@1e78a000/i2c-bus@100/power-supply@68 \ + bus@1e78a000/i2c-bus@100/power-supply@69 \ bus@1e78a000/i2c-bus@100/bmp280@77 \ bus@1e78a000/i2c-bus@100/dps310@76 \ bus@1e78a000/i2c-bus@140/ir35221@70 \ @@ -23,7 +21,11 @@ CHIPS_append_witherspoon = " \ bus@1e78a000/i2c-bus@180/ir35221@71 \ bus@1e78a000/i2c-bus@380/tmp275@4a \ " -CHIPS_append_swift = " \ +CHIPS_swift = " \ + bus@1e78a000/i2c-bus@100/max31785@52_air \ + bus@1e78a000/i2c-bus@100/max31785@52_water \ + bus@1e78a000/i2c-bus@100/power-supply@68 \ + bus@1e78a000/i2c-bus@100/power-supply@69 \ bus@1e78a000/i2c-bus@440/tmp275@4a \ bus@1e78a000/i2c-bus@440/tmp275@48 \ bus@1e78a000/i2c-bus@300/tmp275@48 \ @@ -50,6 +52,19 @@ CHIPS_mihawk = " \ bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48 \ " +CHIPS_witherspoon-tacoma = " \ + bus@1e78a000/i2c-bus@200/max31785@52_air \ + bus@1e78a000/i2c-bus@200/max31785@52_water \ + bus@1e78a000/i2c-bus@200/power-supply@68 \ + bus@1e78a000/i2c-bus@200/power-supply@69 \ + bus@1e78a000/i2c-bus@200/bmp280@77 \ + bus@1e78a000/i2c-bus@200/dps310@76 \ + bus@1e78a000/i2c-bus@280/ir35221@70 \ + bus@1e78a000/i2c-bus@280/ir35221@71 \ + bus@1e78a000/i2c-bus@300/ir35221@70 \ + bus@1e78a000/i2c-bus@300/ir35221@71 \ + bus@1e78a000/i2c-bus@500/tmp275@4a \ + " ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" ITEMS_append_mihawk += " iio-hwmon-vdd0.conf" @@ -71,9 +86,9 @@ ITEMS_append_mihawk += " iio-hwmon-battery.conf" OCCS = " \ 00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \ - 00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ + 00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ " -OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" +OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" diff --git a/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb b/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb index b04e20fed..d986ef19b 100755 --- a/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb +++ b/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb @@ -1,170 +1,24 @@ -SUMMARY = "Power Control service for Intel based platform" -DESCRIPTION = "Power Control service for Intel based platfrom" -PR = "r1" -PV = "1.0+git${SRCPV}" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" +SUMMARY = "Chassis Power Control service for Intel based platforms" +DESCRIPTION = "Chassis Power Control service for Intel based platforms" -S = "${WORKDIR}/git" -SRC_URI += "git://github.com/openbmc/x86-power-control.git" +SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh" SRCREV = "f61ca6fdcc52beba485e014b5fad38a9e9a555ad" -inherit cmake pkgconfig pythonnative systemd - -SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Power@.service" - -# Force the standby target to run these services -SYSD_TGT = "multi-user.target" - -POWER_TMPL_CTRL = "xyz.openbmc_project.Chassis.Control.Power@.service" -#SYSD_TGT = "multi-user.target" -POWER_INSTFMT_CTRL = "xyz.openbmc_project.Chassis.Control.Power@{0}.service" -POWER_FMT_CTRL = "../${POWER_TMPL_CTRL}:${SYSD_TGT}.wants/${POWER_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POWER_FMT_CTRL', 'OBMC_HOST_INSTANCES')}" - -SYSTEMD_SERVICE_${PN} += " \ - obmc-host-start@.target \ - obmc-host-startmin@.target \ - obmc-host-stop@.target \ - obmc-host-reboot@.target \ - obmc-chassis-poweroff@.target \ - obmc-chassis-poweron@.target \ - obmc-chassis-hard-poweroff@.target \ - obmc-host-soft-reboot@.target \ - obmc-host-warm-reset@.target \ - obmc-chassis-powerreset@.target \ - " - -RESET_TGTFMT = "obmc-chassis-powerreset@{0}.target" - -RESET_ON_TMPL = "op-reset-chassis-running@.service" -RESET_ON_INSTFMT = "op-reset-chassis-running@{0}.service" -RESET_ON_FMT = "../${RESET_ON_TMPL}:${RESET_TGTFMT}.requires/${RESET_ON_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${RESET_ON_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_FMT', 'OBMC_CHASSIS_INSTANCES')}" - -RESET_ON_CHASSIS_TMPL = "op-reset-chassis-on@.service" -RESET_ON_CHASSIS_INSTFMT = "op-reset-chassis-on@{0}.service" -RESET_ON_CHASSIS_FMT = "../${RESET_ON_CHASSIS_TMPL}:${RESET_TGTFMT}.requires/${RESET_ON_CHASSIS_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${RESET_ON_CHASSIS_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_CHASSIS_INSTANCES')}" - -# Force the standby target to run the chassis reset check target -RESET_TMPL_CTRL = "obmc-chassis-powerreset@.target" -SYSD_TGT = "multi-user.target" -RESET_INSTFMT_CTRL = "obmc-chassis-powerreset@{0}.target" -RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" - -START_TMPL = "intel-power-start@.service" -START_TGTFMT = "obmc-chassis-poweron@{0}.target" -START_INSTFMT = "intel-power-start@{0}.service" -START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${START_TMPL}" - -STOP_TMPL = "intel-power-stop@.service" -STOP_TGTFMT = "obmc-chassis-poweroff@{0}.target" -STOP_INSTFMT = "intel-power-stop@{0}.service" -STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.requires/${STOP_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${STOP_TMPL}" - -WARM_RESET_TMPL = "intel-power-warm-reset@.service" -WARM_RESET_TGTFMT = "obmc-host-warm-reset@{0}.target" -WARM_RESET_INSTFMT = "intel-power-warm-reset@{0}.service" -WARM_RESET_FMT = "../${WARM_RESET_TMPL}:${WARM_RESET_TGTFMT}.requires/${WARM_RESET_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${WARM_RESET_TMPL}" - -# Build up requires relationship for START_TGTFMT and STOP_TGTFMT -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'START_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'STOP_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'WARM_RESET_FMT', 'OBMC_CHASSIS_INSTANCES')}" - -#The main control target requires these power targets -START_TMPL_CTRL = "obmc-chassis-poweron@.target" -START_TGTFMT_CTRL = "obmc-host-startmin@{0}.target" -START_INSTFMT_CTRL = "obmc-chassis-poweron@{0}.target" -START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${START_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'START_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" - -# Chassis off requires host off -STOP_TMPL_CTRL = "obmc-host-stop@.target" -STOP_TGTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" -STOP_INSTFMT_CTRL = "obmc-host-stop@{0}.target" -STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'STOP_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" - -# Hard power off requires chassis off -HARD_OFF_TMPL_CTRL = "obmc-chassis-poweroff@.target" -HARD_OFF_TGTFMT_CTRL = "obmc-chassis-hard-poweroff@{0}.target" -HARD_OFF_INSTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" -HARD_OFF_FMT_CTRL = "../${HARD_OFF_TMPL_CTRL}:${HARD_OFF_TGTFMT_CTRL}.requires/${HARD_OFF_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HARD_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" - -# Host soft reboot to run the shutdown target -HOST_SHUTDOWN_TMPL = "obmc-host-shutdown@.target" -HOST_SOFT_REBOOT_TMPL = "obmc-host-soft-reboot@.target" -HOST_SOFT_REBOOT_TGTFMT = "obmc-host-soft-reboot@{0}.target" -HOST_SHUTDOWN_INSTFMT = "obmc-host-shutdown@{0}.target" -HOST_SOFT_REBOOT_FMT = "../${HOST_SHUTDOWN_TMPL}:${HOST_SOFT_REBOOT_TGTFMT}.requires/${HOST_SHUTDOWN_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_SOFT_REBOOT_FMT', 'OBMC_HOST_INSTANCES')}" -# And also to call the host startmin service -HOST_SOFT_REBOOT_SVC = "phosphor-reboot-host@.service" -HOST_SOFT_REBOOT_SVC_INST = "phosphor-reboot-host@{0}.service" -HOST_SOFT_REBOOT_SVC_FMT = "../${HOST_SOFT_REBOOT_SVC}:${HOST_SOFT_REBOOT_TGTFMT}.requires/${HOST_SOFT_REBOOT_SVC_INST}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_SOFT_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" - -#Broadcast Host state -PRE_HOST_START_TMPL = "obmc-send-signal-pre-host-start@.service" -PRE_HOST_START_TGTFMT = "obmc-host-start-pre@{0}.target" -PRE_HOST_START_INSTFMT = "obmc-send-signal-pre-host-start@{0}.service" -PRE_HOST_START_FMT = "../${PRE_HOST_START_TMPL}:${PRE_HOST_START_TGTFMT}.requires/${PRE_HOST_START_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${PRE_HOST_START_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'PRE_HOST_START_FMT', 'OBMC_HOST_INSTANCES')}" - -POST_HOST_START_TMPL = "obmc-send-signal-post-host-start@.service" -POST_HOST_START_TGTFMT = "obmc-host-started@{0}.target" -POST_HOST_START_INSTFMT = "obmc-send-signal-post-host-start@{0}.service" -POST_HOST_START_FMT = "../${POST_HOST_START_TMPL}:${POST_HOST_START_TGTFMT}.requires/${POST_HOST_START_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${POST_HOST_START_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POST_HOST_START_FMT', 'OBMC_HOST_INSTANCES')}" +PV = "1.0+git${SRCPV}" -HOST_STARTING_TMPL = "obmc-send-signal-host-starting@.service" -HOST_STARTING_TGTFMT = "obmc-host-starting@{0}.target" -HOST_STARTING_INSTFMT = "obmc-send-signal-host-starting@{0}.service" -HOST_STARTING_FMT = "../${HOST_STARTING_TMPL}:${HOST_STARTING_TGTFMT}.requires/${HOST_STARTING_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${HOST_STARTING_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_STARTING_FMT', 'OBMC_HOST_INSTANCES')}" +S = "${WORKDIR}/git" -PRE_HOST_STOP_TMPL = "obmc-send-signal-pre-host-stop@.service" -PRE_HOST_STOP_TGTFMT = "obmc-host-stop-pre@{0}.target" -PRE_HOST_STOP_INSTFMT = "obmc-send-signal-pre-host-stop@{0}.service" -PRE_HOST_STOP_FMT = "../${PRE_HOST_STOP_TMPL}:${PRE_HOST_STOP_TGTFMT}.requires/${PRE_HOST_STOP_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${PRE_HOST_STOP_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'PRE_HOST_STOP_FMT', 'OBMC_HOST_INSTANCES')}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -POST_HOST_STOP_TMPL = "obmc-send-signal-post-host-stop@.service" -POST_HOST_STOP_TGTFMT = "obmc-host-stopped@{0}.target" -POST_HOST_STOP_INSTFMT = "obmc-send-signal-post-host-stop@{0}.service" -POST_HOST_STOP_FMT = "../${POST_HOST_STOP_TMPL}:${POST_HOST_STOP_TGTFMT}.requires/${POST_HOST_STOP_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${POST_HOST_STOP_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POST_HOST_STOP_FMT', 'OBMC_HOST_INSTANCES')}" +inherit cmake systemd -HOST_STOPPING_TMPL = "obmc-send-signal-host-stopping@.service" -HOST_STOPPING_TGTFMT = "obmc-host-stopping@{0}.target" -HOST_STOPPING_INSTFMT = "obmc-send-signal-host-stopping@{0}.service" -HOST_STOPPING_FMT = "../${HOST_STOPPING_TMPL}:${HOST_STOPPING_TGTFMT}.requires/${HOST_STOPPING_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${HOST_STOPPING_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_STOPPING_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Power.service" DEPENDS += " \ - autoconf-archive-native \ boost \ - systemd \ + i2c-tools \ + libgpiod \ sdbusplus \ - sdbusplus-native \ - phosphor-dbus-interfaces \ - phosphor-dbus-interfaces-native \ phosphor-logging \ - " - -EXTRA_OECMAKE = " -DENABLE_GTEST=OFF " + " diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index e0f9d9867..eb14bf736 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "bf124d462bc5a6cb76637b3a2439e564d11a95e9" +SRCREV = "262276f4964191d780aeab3a821de54b01c0a8ff" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-nuvoton/conf/layer.conf b/meta-nuvoton/conf/layer.conf index a592301c2..0ca32584d 100644 --- a/meta-nuvoton/conf/layer.conf +++ b/meta-nuvoton/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "nuvoton-layer" BBFILE_PATTERN_nuvoton-layer = "" LAYERVERSION_nuvoton-layer = "1" -LAYERSERIES_COMPAT_nuvoton-layer = "thud warrior" +LAYERSERIES_COMPAT_nuvoton-layer = "warrior zeus" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb index 8d1bbdfd1..a1996a1a3 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb @@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SECTION = "x11/gnome" -SRC_URI[archive.md5sum] = "e1ac0b6285abefeed69ca9e380e44f5a" -SRC_URI[archive.sha256sum] = "68bce78b19bc94cb2c3bb8587e37f9e5e338568c3a674f86edde9c9f1624ffab" +SRC_URI[archive.md5sum] = "a3ab18ed51a0494a1c8436fef20cc1b0" +SRC_URI[archive.sha256sum] = "943a94ab16121de5580ceaed2605b87444d1bca1c6cd8beefb778bcb0aa2da52" DEPENDS = "dbus glib-2.0 intltool-native" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc index 9e1c323fe..c4c623ad9 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc @@ -5,8 +5,8 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" SRC_URI = "git://github.com/FluidSynth/fluidsynth.git" -SRCREV = "f78486a50bd785200412ea16434b38edc4a45a6c" +SRCREV = "62b38b1c66aec606f83b322bb03bd84810bbda41" S = "${WORKDIR}/git" -PV = "2.0.6" +PV = "2.0.7" inherit cmake pkgconfig lib_package diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb index 455e76fcb..235e63e48 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb @@ -1,5 +1,5 @@ SUMMARY = "C client library for the Music Player Daemon" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=06b9dfd2f197dc514d8ef06549684b77" HOMEPAGE = "https://www.musicpd.org/libs/libmpdclient/" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch index c03bccd3d..43994e0ca 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch @@ -1,4 +1,4 @@ -From 6272f36080bd440a5825b526f4c06223c5bb9fbb Mon Sep 17 00:00:00 2001 +From 07fce2101d83b5334de78e661ba0361c2874ebdf Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.francis@wdc.com> Date: Mon, 18 Mar 2019 16:30:45 -0700 Subject: [PATCH 1/5] Remove python venv @@ -9,75 +9,77 @@ python and pip pacakges. Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Upstream-Status: Inappropriate [embedded specific] --- - dev_setup.sh | 36 ------------------------------------ + dev_setup.sh | 39 --------------------------------------- start-mycroft.sh | 13 ------------- venv-activate.sh | 44 +------------------------------------------- - 3 files changed, 1 insertion(+), 92 deletions(-) + 3 files changed, 1 insertion(+), 95 deletions(-) diff --git a/dev_setup.sh b/dev_setup.sh -index e0b07bf25cf..aed54b2167a 100755 +index cf81ed25f0f..99a44bfd8a7 100755 --- a/dev_setup.sh +++ b/dev_setup.sh -@@ -310,18 +310,6 @@ function install_deps() { +@@ -338,18 +338,6 @@ ${YELLOW}Make sure to manually install:$BLUE git python3 python-setuptools pytho fi } -VIRTUALENV_ROOT=${VIRTUALENV_ROOT:-"${TOP}/.venv"} - -function install_venv() { -- ${opt_python} -m venv "${VIRTUALENV_ROOT}/" --without-pip +- $opt_python -m venv "${VIRTUALENV_ROOT}/" --without-pip - # Force version of pip for reproducability, but there is nothing special - # about this version. Update whenever a new version is released and - # verified functional. - curl https://bootstrap.pypa.io/3.3/get-pip.py | "${VIRTUALENV_ROOT}/bin/python" - 'pip==18.0.0' - # Function status depending on if pip exists -- [ -x "${VIRTUALENV_ROOT}/bin/pip" ] +- [[ -x ${VIRTUALENV_ROOT}/bin/pip ]] -} - install_deps # Configure to use the standard commit template for -@@ -355,15 +343,7 @@ else +@@ -383,17 +371,6 @@ else fi fi --if [ ! -x "${VIRTUALENV_ROOT}/bin/activate" ] ; then +-if [[ ! -x ${VIRTUALENV_ROOT}/bin/activate ]] ; then - if ! install_venv ; then -- echo "Failed to set up virtualenv for mycroft, exiting setup." +- echo 'Failed to set up virtualenv for mycroft, exiting setup.' - exit 1 - fi -fi - - # Start the virtual environment +-# Start the virtual environment -source "${VIRTUALENV_ROOT}/bin/activate" - cd "${TOP}" - +-cd "$TOP" +- # Install pep8 pre-commit hook -@@ -380,22 +360,6 @@ fi + HOOK_FILE='./.git/hooks/pre-commit' + if [[ -n $INSTALL_PRECOMMIT_HOOK ]] || grep -q 'MYCROFT DEV SETUP' $HOOK_FILE; then +@@ -408,22 +385,6 @@ fi - PYTHON=$( python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))" ) + PYTHON=$(python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))") -# Add mycroft-core to the virtualenv path -# (This is equivalent to typing 'add2virtualenv $TOP', except -# you can't invoke that shell function from inside a script) -VENV_PATH_FILE="${VIRTUALENV_ROOT}/lib/$PYTHON/site-packages/_virtualenv_path_extensions.pth" --if [ ! -f "$VENV_PATH_FILE" ] ; then -- echo "import sys; sys.__plen = len(sys.path)" > "$VENV_PATH_FILE" || return 1 +-if [[ ! -f $VENV_PATH_FILE ]] ; then +- echo 'import sys; sys.__plen = len(sys.path)' > "$VENV_PATH_FILE" || return 1 - echo "import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new)" >> "$VENV_PATH_FILE" || return 1 -fi - -if ! grep -q "$TOP" $VENV_PATH_FILE ; then -- echo "Adding mycroft-core to virtualenv path" +- echo 'Adding mycroft-core to virtualenv path' - sed -i.tmp '1 a\ -'"$TOP"' --' "${VENV_PATH_FILE}" +-' "$VENV_PATH_FILE" -fi - # install required python modules if ! pip install -r requirements.txt ; then - echo "Warning: Failed to install all requirements. Continue? y/N" + echo 'Warning: Failed to install all requirements. Continue? y/N' diff --git a/start-mycroft.sh b/start-mycroft.sh -index b9514a61ba5..64e0216a62f 100755 +index 0f88430982e..3aed2f189d4 100755 --- a/start-mycroft.sh +++ b/start-mycroft.sh @@ -20,7 +20,6 @@ script=${0} @@ -130,7 +132,7 @@ index b9514a61ba5..64e0216a62f 100755 "sdkdoc") - source-venv cd doc - make ${opt} + make ${_params} cd .. diff --git a/venv-activate.sh b/venv-activate.sh index d1e7bcb44e7..10b46d4de3b 100644 @@ -188,5 +190,5 @@ index d1e7bcb44e7..10b46d4de3b 100644 main $@ -- -2.21.0 +2.23.0 diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch new file mode 100644 index 000000000..dd2431fdf --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch @@ -0,0 +1,48 @@ +From 88696037af52d6a7f57bc0fb82598de1a25365cc Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Fri, 29 Mar 2019 16:09:57 -0700 +Subject: [PATCH 2/5] dev_setup.sh: Remove the git dependency + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Upstream-Status: Inappropriate [embedded specific] +--- + dev_setup.sh | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/dev_setup.sh b/dev_setup.sh +index 99a44bfd8a7..672b27080c2 100755 +--- a/dev_setup.sh ++++ b/dev_setup.sh +@@ -340,10 +340,6 @@ ${YELLOW}Make sure to manually install:$BLUE git python3 python-setuptools pytho + + install_deps + +-# Configure to use the standard commit template for +-# this repo only. +-git config commit.template .gitmessage +- + # Check whether to build mimic (it takes a really long time!) + build_mimic='n' + if [[ $opt_forcemimicbuild == true ]] ; then +@@ -371,18 +367,6 @@ else + fi + fi + +-# Install pep8 pre-commit hook +-HOOK_FILE='./.git/hooks/pre-commit' +-if [[ -n $INSTALL_PRECOMMIT_HOOK ]] || grep -q 'MYCROFT DEV SETUP' $HOOK_FILE; then +- if [[ ! -f $HOOK_FILE ]] || grep -q 'MYCROFT DEV SETUP' $HOOK_FILE; then +- echo 'Installing PEP8 check as precommit-hook' +- echo "#! $(which python)" > $HOOK_FILE +- echo '# MYCROFT DEV SETUP' >> $HOOK_FILE +- cat ./scripts/pre-commit >> $HOOK_FILE +- chmod +x $HOOK_FILE +- fi +-fi +- + PYTHON=$(python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))") + + # install required python modules +-- +2.23.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-pip-requirements-Remove-ones-installed-by-OE.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-pip-requirements-Remove-ones-installed-by-OE.patch deleted file mode 100644 index ca79d00b4..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-pip-requirements-Remove-ones-installed-by-OE.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 142bc3912ea9e1a4ecf4db0e2bec3049aa416464 Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Tue, 19 Mar 2019 13:32:54 -0700 -Subject: [PATCH 2/5] pip requirements: Remove ones installed by OE - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> -Upstream-Status: Inappropriate [embedded specific] ---- - requirements.txt | 14 -------------- - test-requirements.txt | 1 - - 2 files changed, 15 deletions(-) - -diff --git a/requirements.txt b/requirements.txt -index 7e4faf48182..29536e990ac 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,20 +1,10 @@ --six==1.10.0 --requests==2.20.0 - gTTS==2.0.3 - gTTS-token==1.1.3 --PyAudio==0.2.11 - pyee==5.0.0 - SpeechRecognition==3.8.1 --tornado==4.5.3 - websocket-client==0.54.0 - requests-futures==0.9.5 --pyalsaaudio==0.8.2 - xmlrunner==1.7.7 --pyserial==3.0 --psutil==5.2.1 --pocketsphinx==0.1.0 --inflection==0.3.1 --pillow==4.1.1 - python-dateutil==2.6.0 - pychromecast==0.7.7 - python-vlc==1.1.2 -@@ -26,10 +16,6 @@ msm==0.7.3 - msk==0.3.12 - adapt-parser==0.3.2 - padatious==0.4.6 --fann2==1.0.7 - padaos==0.1.9 - precise-runner==0.2.1 - petact==0.1.2 -- --# dev setup tools --pep8==1.7.0 -diff --git a/test-requirements.txt b/test-requirements.txt -index 8ada8157c95..eb4e364a9b4 100644 ---- a/test-requirements.txt -+++ b/test-requirements.txt -@@ -1,6 +1,5 @@ - pep8==1.7.0 - coveralls==1.5.0 --pytest==3.5.0 - pytest-cov==2.5.1 - cov-core==1.15.0 - mock==2.0.0 --- -2.21.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-dev_setup.sh-Remove-the-TERM-dependency.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-dev_setup.sh-Remove-the-TERM-dependency.patch new file mode 100644 index 000000000..a4290d1cd --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-dev_setup.sh-Remove-the-TERM-dependency.patch @@ -0,0 +1,36 @@ +From 5ef52cdea278a1dff966a912549cb6708f2cb699 Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Tue, 17 Sep 2019 11:31:47 -0700 +Subject: [PATCH 3/5] dev_setup.sh: Remove the TERM dependency + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +--- + dev_setup.sh | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/dev_setup.sh b/dev_setup.sh +index 672b27080c2..72f734f36bf 100755 +--- a/dev_setup.sh ++++ b/dev_setup.sh +@@ -115,18 +115,6 @@ function get_YN() { + done + } + +-# If tput is available and can handle multiple colors +-if found_exe tput ; then +- if [[ $(tput colors) != "-1" ]]; then +- GREEN=$(tput setaf 2) +- BLUE=$(tput setaf 4) +- CYAN=$(tput setaf 6) +- YELLOW=$(tput setaf 3) +- RESET=$(tput sgr0) +- HIGHLIGHT=$YELLOW +- fi +-fi +- + # Run a setup wizard the very first time that guides the user through some decisions + if [[ ! -f .dev_opts.json && -z $CI ]] ; then + echo " +-- +2.23.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-dev_setup.sh-Remove-the-git-dependency.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-dev_setup.sh-Remove-the-git-dependency.patch deleted file mode 100644 index b7ca16013..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-dev_setup.sh-Remove-the-git-dependency.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a480dde949f820fda6e46c13261883e851f5a430 Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Fri, 29 Mar 2019 16:09:57 -0700 -Subject: [PATCH 4/5] dev_setup.sh: Remove the git dependency - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> -Upstream-Status: Inappropriate [embedded specific] ---- - dev_setup.sh | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/dev_setup.sh b/dev_setup.sh -index dd391181f19..c6aa783e1ef 100755 ---- a/dev_setup.sh -+++ b/dev_setup.sh -@@ -312,10 +312,6 @@ function install_deps() { - - install_deps - --# Configure to use the standard commit template for --# this repo only. --git config commit.template .gitmessage -- - # Check whether to build mimic (it takes a really long time!) - build_mimic="n" - if [[ ${opt_forcemimicbuild} == true ]] ; then -@@ -346,18 +342,6 @@ fi - # Start the virtual environment - cd "${TOP}" - --# Install pep8 pre-commit hook --if [ -z ${INSTALL_PRECOMMIT_HOOK} ] ; then -- HOOK_FILE="./.git/hooks/pre-commit" -- if [ ! -f ${HOOK_FILE} ] || grep -q "MYCROFT DEV SETUP" ${HOOK_FILE} ; then -- echo "Installing PEP8 check as precommit-hook" -- echo "#! $( which python3 )" > ${HOOK_FILE} -- echo "# MYCROFT DEV SETUP" >> ${HOOK_FILE} -- cat ./scripts/pre-commit >> ${HOOK_FILE} -- chmod +x ${HOOK_FILE} -- fi --fi -- - PYTHON=$( python3 -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))" ) - - # install required python modules --- -2.21.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-pip-requirements-Don-t-install-requirements-with-pip.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-pip-requirements-Don-t-install-requirements-with-pip.patch new file mode 100644 index 000000000..3063e7f8d --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-pip-requirements-Don-t-install-requirements-with-pip.patch @@ -0,0 +1,103 @@ +From ac749f2512e8d121e8a64a8d5e6f226f16735dda Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Tue, 19 Mar 2019 13:32:54 -0700 +Subject: [PATCH 4/5] pip requirements: Don't install requirements with pip + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Upstream-Status: Inappropriate [embedded specific] +--- + dev_setup.sh | 15 +-------------- + requirements.txt | 36 ------------------------------------ + test-requirements.txt | 7 ------- + 3 files changed, 1 insertion(+), 57 deletions(-) + delete mode 100644 requirements.txt + delete mode 100644 test-requirements.txt + +diff --git a/dev_setup.sh b/dev_setup.sh +index 72f734f36bf..b5ca6851631 100755 +--- a/dev_setup.sh ++++ b/dev_setup.sh +@@ -357,19 +357,6 @@ fi + + PYTHON=$(python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))") + +-# install required python modules +-if ! pip install -r requirements.txt ; then +- echo 'Warning: Failed to install all requirements. Continue? y/N' +- read -n1 continue +- if [[ $continue != 'y' ]] ; then +- exit 1 +- fi +-fi +- +-if ! pip install -r test-requirements.txt ; then +- echo "Warning test requirements wasn't installed, Note: normal operation should still work fine..." +-fi +- + SYSMEM=$(free | awk '/^Mem:/ { print $2 }') + MAXCORES=$(($SYSMEM / 512000)) + MINCORES=1 +@@ -426,4 +413,4 @@ if [[ ! -w /var/log/mycroft/ ]] ; then + fi + + #Store a fingerprint of setup +-md5sum requirements.txt test-requirements.txt dev_setup.sh > .installed ++md5sum dev_setup.sh > .installed +diff --git a/requirements.txt b/requirements.txt +deleted file mode 100644 +index 0140d5465dc..00000000000 +--- a/requirements.txt ++++ /dev/null +@@ -1,36 +0,0 @@ +-six==1.10.0 +-cryptography==2.6.1 +-requests==2.20.0 +-gTTS==2.0.3 +-gTTS-token==1.1.3 +-PyAudio==0.2.11 +-pyee==5.0.0 +-SpeechRecognition==3.8.1 +-tornado==4.5.3 +-websocket-client==0.54.0 +-requests-futures==0.9.5 +-pyalsaaudio==0.8.2 +-xmlrunner==1.7.7 +-pyserial==3.0 +-psutil==5.2.1 +-pocketsphinx==0.1.0 +-inflection==0.3.1 +-pillow==4.1.1 +-python-dateutil==2.6.0 +-pychromecast==3.2.2 +-python-vlc==1.1.2 +-google-api-python-client==1.6.4 +-fasteners==0.14.1 +-PyYAML==3.13 +- +-msm==0.8.3 +-msk==0.3.13 +-adapt-parser==0.3.3 +-padatious==0.4.6 +-fann2==1.0.7 +-padaos==0.1.9 +-precise-runner==0.2.1 +-petact==0.1.2 +- +-# dev setup tools +-pep8==1.7.0 +diff --git a/test-requirements.txt b/test-requirements.txt +deleted file mode 100644 +index fd129e3f66d..00000000000 +--- a/test-requirements.txt ++++ /dev/null +@@ -1,7 +0,0 @@ +-pycodestyle===2.5.0 +-coveralls==1.5.0 +-pytest==3.5.0 +-pytest-cov==2.5.1 +-cov-core==1.15.0 +-sphinx==1.8.2 +-sphinx-rtd-theme==0.4.2 +-- +2.23.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-Use-python3-and-pip3-instead-of-python-and-pip.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-Use-python3-and-pip3-instead-of-python-and-pip.patch index a1f04b4b4..189b686c9 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-Use-python3-and-pip3-instead-of-python-and-pip.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-Use-python3-and-pip3-instead-of-python-and-pip.patch @@ -1,19 +1,19 @@ -From 87b94e54fefa1f83b41030444fc87b421c97b2c5 Mon Sep 17 00:00:00 2001 +From 9a0bd09706da3949db17ea7272d6647a487bb6ad Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.francis@wdc.com> Date: Tue, 19 Mar 2019 13:38:44 -0700 -Subject: [PATCH 3/5] Use python3 and pip3 instead of python and pip +Subject: [PATCH 5/5] Use python3 and pip3 instead of python and pip Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Upstream-Status: Inappropriate [embedded specific] --- - bin/mycroft-cli-client | 2 +- - bin/mycroft-pip | 2 +- - bin/mycroft-say-to | 2 +- - bin/mycroft-skill-testrunner | 4 ++-- - bin/mycroft-speak | 2 +- - dev_setup.sh | 10 +++++----- - scripts/install-pocketsphinx.sh | 2 +- - 7 files changed, 12 insertions(+), 12 deletions(-) + bin/mycroft-cli-client | 2 +- + bin/mycroft-pip | 2 +- + bin/mycroft-say-to | 2 +- + bin/mycroft-skill-testrunner | 4 ++-- + bin/mycroft-speak | 2 +- + dev_setup.sh | 6 +++--- + scripts/install-pocketsphinx.sh | 2 +- + 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/mycroft-cli-client b/bin/mycroft-cli-client index f40a316e3f6..de2040d9e67 100755 @@ -38,15 +38,15 @@ index a42b16b847a..81bd5bfb3cf 100755 +pip3 $@ \ No newline at end of file diff --git a/bin/mycroft-say-to b/bin/mycroft-say-to -index 964e16eb0c5..5575969715c 100755 +index 4ae597f3062..8bb4039996d 100755 --- a/bin/mycroft-say-to +++ b/bin/mycroft-say-to -@@ -22,4 +22,4 @@ DIR="$( pwd )" - source "$DIR/../venv-activate.sh" -q +@@ -26,4 +26,4 @@ set -- "${1:-$(</dev/stdin)}" "${@:2}" # Send a message to be spoken --output=$(python -m mycroft.messagebus.send "recognizer_loop:utterance" "{\"utterances\": [\"$@\"], \"lang\": \"en-us\"}") -+output=$(python3 -m mycroft.messagebus.send "recognizer_loop:utterance" "{\"utterances\": [\"$@\"], \"lang\": \"en-us\"}") + data="$@" +-output=$(python -m mycroft.messagebus.send "recognizer_loop:utterance" "{\"utterances\": [\"$data\"], \"lang\": \"en-us\"}") ++output=$(python3 -m mycroft.messagebus.send "recognizer_loop:utterance" "{\"utterances\": [\"$data\"], \"lang\": \"en-us\"}") diff --git a/bin/mycroft-skill-testrunner b/bin/mycroft-skill-testrunner index 9699a4d138f..282f5ca65b0 100755 --- a/bin/mycroft-skill-testrunner @@ -63,60 +63,46 @@ index 9699a4d138f..282f5ca65b0 100755 fi \ No newline at end of file diff --git a/bin/mycroft-speak b/bin/mycroft-speak -index 51facf29189..c65556f1173 100755 +index d80f0e75b13..9448ea3400f 100755 --- a/bin/mycroft-speak +++ b/bin/mycroft-speak -@@ -22,4 +22,4 @@ DIR="$( pwd )" - source "$DIR/../venv-activate.sh" -q +@@ -24,4 +24,4 @@ source "$DIR/../venv-activate.sh" -q # Send a message to be spoken --output=$(python -m mycroft.messagebus.send "speak" "{\"utterance\": \"$@\"}") -\ No newline at end of file -+output=$(python3 -m mycroft.messagebus.send "speak" "{\"utterance\": \"$@\"}") -\ No newline at end of file + data="$@" +-output=$(python -m mycroft.messagebus.send "speak" "{\"utterance\": \"$data\"}") ++output=$(python3 -m mycroft.messagebus.send "speak" "{\"utterance\": \"$data\"}") diff --git a/dev_setup.sh b/dev_setup.sh -index aed54b2167a..dd391181f19 100755 +index b5ca6851631..fcd0834669f 100755 --- a/dev_setup.sh +++ b/dev_setup.sh -@@ -48,7 +48,7 @@ param="" +@@ -48,7 +48,7 @@ param='' for var in "$@" ; do # Check if parameter should be read -- if [[ ${param} == "python" ]] ; then -+ if [[ ${param} == "python3" ]] ; then - opt_python=${var} +- if [[ $param == 'python' ]] ; then ++ if [[ $param == 'python3' ]] ; then + opt_python=$var param="" continue -@@ -351,17 +351,17 @@ if [ -z ${INSTALL_PRECOMMIT_HOOK} ] ; then - HOOK_FILE="./.git/hooks/pre-commit" - if [ ! -f ${HOOK_FILE} ] || grep -q "MYCROFT DEV SETUP" ${HOOK_FILE} ; then - echo "Installing PEP8 check as precommit-hook" -- echo "#! $( which python )" > ${HOOK_FILE} -+ echo "#! $( which python3 )" > ${HOOK_FILE} - echo "# MYCROFT DEV SETUP" >> ${HOOK_FILE} - cat ./scripts/pre-commit >> ${HOOK_FILE} - chmod +x ${HOOK_FILE} +@@ -75,7 +75,7 @@ for var in "$@" ; do + opt_skipmimicbuild=true fi - fi - --PYTHON=$( python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))" ) -+PYTHON=$( python3 -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))" ) + if [[ $var == '-p' || $var == '--python' ]] ; then +- param='python' ++ param='python3' + fi + done - # install required python modules --if ! pip install -r requirements.txt ; then -+if ! pip3 install -r requirements.txt ; then - echo "Warning: Failed to install all requirements. Continue? y/N" - read -n1 continue - if [[ "$continue" != "y" ]] ; then -@@ -369,7 +369,7 @@ if ! pip install -r requirements.txt ; then +@@ -355,7 +355,7 @@ else fi fi --if ! pip install -r test-requirements.txt ; then -+if ! pip3 install -r test-requirements.txt ; then - echo "Warning test requirements wasn't installed, Note: normal operation should still work fine..." - fi +-PYTHON=$(python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))") ++PYTHON=$(python3 -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))") + SYSMEM=$(free | awk '/^Mem:/ { print $2 }') + MAXCORES=$(($SYSMEM / 512000)) diff --git a/scripts/install-pocketsphinx.sh b/scripts/install-pocketsphinx.sh index 44d329b7985..d45f5c22747 100755 --- a/scripts/install-pocketsphinx.sh @@ -131,5 +117,5 @@ index 44d329b7985..d45f5c22747 100755 if [ "$1" = "-q" ] ; then -- -2.21.0 +2.23.0 diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-dev_setup.sh-Remove-the-test-setup-dependency.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-dev_setup.sh-Remove-the-test-setup-dependency.patch deleted file mode 100644 index 5ae868376..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-dev_setup.sh-Remove-the-test-setup-dependency.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7fc38ae0dec30789fa0d365f1764f4950b700a98 Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Tue, 2 Apr 2019 16:52:44 -0700 -Subject: [PATCH 5/5] dev_setup.sh: Remove the test setup dependency - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> ---- - dev_setup.sh | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/dev_setup.sh b/dev_setup.sh -index c6aa783e1ef..bcfaa0c16c2 100755 ---- a/dev_setup.sh -+++ b/dev_setup.sh -@@ -353,10 +353,6 @@ if ! pip3 install -r requirements.txt ; then - fi - fi - --if ! pip3 install -r test-requirements.txt ; then -- echo "Warning test requirements wasn't installed, Note: normal operation should still work fine..." --fi -- - SYSMEM=$( free | awk '/^Mem:/ { print $2 }' ) - MAXCORES=$(($SYSMEM / 512000)) - MINCORES=1 --- -2.21.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft-setup.service b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft-setup.service index 07598235e..4b4bcdd77 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft-setup.service +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft-setup.service @@ -5,7 +5,8 @@ After=systemd-user-sessions.service [Service] Type=oneshot -ExecStart=@LIBDIR@/mycroft/dev_setup.sh --allow-root +ExecStart=cp -rf @LIBDIR@/mycroft /var/ +ExecStart=/var/mycroft/dev_setup.sh --allow-root [Install] WantedBy=multi-user.target diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service index 28729f6b1..c7f477f13 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/mycroft.service @@ -5,10 +5,10 @@ After=mycroft-setup.service [Service] Type=forking -WorkingDirectory=@LIBDIR@/mycroft +WorkingDirectory=/var/mycroft ExecStartPre=mkdir -p /var/log/mycroft -ExecStart=@LIBDIR@/mycroft/start-mycroft.sh all -ExecStop=@LIBDIR@/mycroft/stop-mycroft.sh all +ExecStart=/var/mycroft/start-mycroft.sh all +ExecStop=/var/mycroft/stop-mycroft.sh all [Install] WantedBy=multi-user.target diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.2.3.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb index b03a90083..d4ac4096b 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.2.3.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb @@ -6,13 +6,13 @@ SECTION = "multimedia" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=79aa497b11564d1d419ee889e7b498f6" -SRCREV = "4b45db34ecd95b62ef2b66a8e5180c66ca791a21" +SRCREV = "913f29d3d550637934f9abf43a097eb2c30d76fc" SRC_URI = "git://github.com/MycroftAI/mycroft-core.git;branch=master \ file://0001-Remove-python-venv.patch \ - file://0002-pip-requirements-Remove-ones-installed-by-OE.patch \ - file://0003-Use-python3-and-pip3-instead-of-python-and-pip.patch \ - file://0004-dev_setup.sh-Remove-the-git-dependency.patch \ - file://0005-dev_setup.sh-Remove-the-test-setup-dependency.patch \ + file://0002-dev_setup.sh-Remove-the-git-dependency.patch \ + file://0003-dev_setup.sh-Remove-the-TERM-dependency.patch \ + file://0004-pip-requirements-Don-t-install-requirements-with-pip.patch \ + file://0005-Use-python3-and-pip3-instead-of-python-and-pip.patch \ file://dev_opts.json \ file://mycroft-setup.service \ file://mycroft.service \ @@ -24,6 +24,7 @@ inherit systemd # Mycroft installs itself on the host # Just copy the setup files to the rootfs +# The mycroft-setup service will copy the files to /var/ where we run them from do_install() { install -d ${D}${libdir}/ cp -r ${B} ${D}${libdir}/mycroft @@ -49,20 +50,30 @@ FILES_${PN} += "${libdir}/mycroft" RDEPENDS_${PN} = "python3" -# Install as many Python packages as we can. -# We don't yet have all the packages in meta-python. -# Install as many as we can and we will install the rest on the target with pip. -# TODO: Add all the remaining packages and remove pip -RDEPENDS_${PN} += "python3-pip \ - python3-requests python3-pillow \ +RDEPENDS_${PN} += "python3-requests python3-pillow \ python3-tornado python3-pyyaml \ python3-pyalsaaudio python3-inflection \ python3-pyserial python3-psutil \ python3-pyaudio python3-fann2 \ python3-pocketsphinx \ - python3-xxhash \ + python3-xxhash python3-pako \ + python3-six python3-cryptography \ + python3-requests-futures \ + python3-xmlrunner python3-fasteners \ + python3-python-vlc \ + python3-padatious python3-padaos \ + python3-petact python3-precise-runner \ + python3-pulsectl python3-pychromecast \ + python3-msm python3-msk \ + python3-websocket-client \ + python3-google-api-python-client \ " +# These packages need to be installed on the target +# python3-speechrecognition python3-pyee==5.0.0 python3-six==1.10.0 +# python3-websocket-client==0.54.0 python3-gtts python3-gtts-token +# python3-python-dateutil python3-adapt-parser python3-lazy + # Mycroft uses Alsa, PulseAudio and Flac RDEPENDS_${PN} += "alsa-utils alsa-plugins alsa-tools" RDEPENDS_${PN} += "pulseaudio pulseaudio-misc pulseaudio-server" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index 365618d95..cef45f9d6 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -27,7 +27,7 @@ RDEPENDS_packagegroup-meta-multimedia = "\ fluidsynth cdparanoia vorbis-tools tremor caps libao libavc1394 \ opusfile gerbera libdvdcss webrtc-audio-processing \ rtmpdump libopenmpt schroedinger mpd mpc libmpdclient \ - ncmpc libmpd libsquish dcadec libiec61883 \ + ncmpc libmpd dcadec libiec61883 \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "", "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "minidlna gst-fluendo-mpegdemux vlc", "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "vo-aacenc sox libde265 gst-openmax", "", d)} \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb index 157e4c91f..8b86f8243 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb @@ -6,7 +6,7 @@ SECTION = "libs/multimedia" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://NOTICE;md5=dbdefe400d894b510a9de14813181d0b" -SRCREV = "67b9210d344c34e8d1aa0cfe638abce71c5221ca" +SRCREV = "8449529c7e50f432091539ba7b438e79b04059b5" SRC_URI = "git://github.com/tinyalsa/tinyalsa" PV = "1.1.1+git${SRCPV}" @@ -19,6 +19,3 @@ inherit cmake # # unresolvable R_AARCH64_ADR_PREL_PG_HI21 relocation against symbol `stderr@@GLIBC_2.17' CFLAGS += " -fPIC -DPIC " - -PACKAGES =+ "${PN}-tools" -FILES_${PN}-tools = "${bindir}/*" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor_20180319.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor_20180319.bb index beeb23ae2..28bb5d924 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor_20180319.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor_20180319.bb @@ -1,7 +1,7 @@ SUMMARY = "Fixed-point decoder" DESCRIPTION = "tremor is a fixed point implementation of the vorbis codec." SECTION = "libs" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=db1b7a668b2a6f47b2af88fb008ad555 \ file://os.h;beginline=3;endline=14;md5=5c0af5e1bedef3ce8178c89f48cd6f1f" DEPENDS = "libogg" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.2.bb index fab27f1ee..7d80a632d 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.2.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://firewalld.init \ " -SRC_URI[md5sum] = "32c16df3f6cc859d0df627baf5ee8401" -SRC_URI[sha256sum] = "88bc63a011209ac046fb5d7bfc73ddcc0bc616ddf3013bbb6bf1a421cb497f76" +SRC_URI[md5sum] = "2549c2006def07a19b4c77ec960e5aab" +SRC_URI[sha256sum] = "fbd1b72b3c4b4d0c20659f664b2ba36175364ffbb9cebf3bdfaf9b5e6983be77" # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 DEPENDS = "intltool-native glib-2.0-native libxslt-native docbook-xsl-stylesheets-native" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-su-to-radiusd-user-group-when-rotating-logs.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-su-to-radiusd-user-group-when-rotating-logs.patch new file mode 100644 index 000000000..5859dc7ed --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-su-to-radiusd-user-group-when-rotating-logs.patch @@ -0,0 +1,104 @@ +From 1f233773962bf1a9c2d228a180eacddb9db2d574 Mon Sep 17 00:00:00 2001 +From: Alexander Scheel <ascheel@redhat.com> +Date: Tue, 7 May 2019 16:04:29 -0400 +Subject: [PATCH] su to radiusd user/group when rotating logs + +The su directive to logrotate ensures that log rotation happens under the +owner of the logs. Otherwise, logrotate runs as root:root, potentially +enabling privilege escalation if a RCE is discovered against the +FreeRADIUS daemon. + +Signed-off-by: Alexander Scheel <ascheel@redhat.com> + +Upstream-Status: Backport +[https://github.com/FreeRADIUS/freeradius-server/commit/1f233773962bf1a9c2d228a180eacddb9db2d574] + +CVE: CVE-2019-10143 + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + debian/freeradius.logrotate | 3 +++ + redhat/freeradius-logrotate | 1 + + scripts/logrotate/freeradius | 3 +++ + suse/radiusd-logrotate | 1 + + 4 files changed, 8 insertions(+) + +diff --git a/debian/freeradius.logrotate b/debian/freeradius.logrotate +index 7d837d5..a8d29b7 100644 +--- a/debian/freeradius.logrotate ++++ b/debian/freeradius.logrotate +@@ -9,6 +9,7 @@ + notifempty + + copytruncate ++ su freerad freerad + } + + # (in order) +@@ -26,6 +27,7 @@ + notifempty + + nocreate ++ su freerad freerad + } + + # There are different detail-rotating strategies you can use. One is +@@ -45,4 +47,5 @@ + notifempty + + nocreate ++ su freerad freerad + } +diff --git a/redhat/freeradius-logrotate b/redhat/freeradius-logrotate +index 360765d..bb97ca5 100644 +--- a/redhat/freeradius-logrotate ++++ b/redhat/freeradius-logrotate +@@ -9,6 +9,7 @@ rotate 4 + missingok + compress + delaycompress ++su radiusd radiusd + + # + # The main server log +diff --git a/scripts/logrotate/freeradius b/scripts/logrotate/freeradius +index 3de435e..eecf631 100644 +--- a/scripts/logrotate/freeradius ++++ b/scripts/logrotate/freeradius +@@ -17,6 +17,7 @@ + notifempty + + copytruncate ++ su radiusd radiusd + } + + # (in order) +@@ -34,6 +35,7 @@ + notifempty + + nocreate ++ su radiusd radiusd + } + + # There are different detail-rotating strategies you can use. One is +@@ -53,4 +55,5 @@ + notifempty + + nocreate ++ su radiusd radiusd + } +diff --git a/suse/radiusd-logrotate b/suse/radiusd-logrotate +index 24d56be..be5a797 100644 +--- a/suse/radiusd-logrotate ++++ b/suse/radiusd-logrotate +@@ -11,6 +11,7 @@ missingok + compress + delaycompress + notifempty ++su radiusd radiusd + + # + # The main server log +-- +2.7.4 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb index 9da15e07a..8c95bbae3 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb @@ -26,6 +26,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x; \ file://freeradius-fix-quoting-for-BUILT_WITH.patch \ file://freeradius-fix-error-for-expansion-of-macro.patch \ file://0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \ + file://0001-su-to-radiusd-user-group-when-rotating-logs.patch \ file://radiusd.service \ file://radiusd-volatiles.conf \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service b/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service index f32edcb90..b851ea71c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service +++ b/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp4.service @@ -6,7 +6,7 @@ After=time-sync.target [Service] ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/ -ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/kea +ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea ExecStart=@SBINDIR@/kea-dhcp4 -c @SYSCONFDIR@/kea/kea-dhcp4.conf [Install] diff --git a/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service b/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service index 26d2205e6..0f9f0ef8d 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service +++ b/meta-openembedded/meta-networking/recipes-connectivity/kea/files/kea-dhcp6.service @@ -6,7 +6,7 @@ After=time-sync.target [Service] ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/ -ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/kea +ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea ExecStart=@SBINDIR@/kea-dhcp6 -c @SYSCONFDIR@/kea/kea-dhcp6.conf [Install] diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.6.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.7.bb index 1f2e0c602..340f643d4 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.6.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.7.bb @@ -18,8 +18,8 @@ SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ file://mosquitto.init \ " -SRC_URI[md5sum] = "529b6de33bac18363c2db46194d8d91c" -SRC_URI[sha256sum] = "82676bf4201ff102be1511b56b041a9450fbbfeda40b21aa28be0fee56e8de17" +SRC_URI[md5sum] = "ec9074c4f337f64eaa9a4320c6dab020" +SRC_URI[sha256sum] = "bcd31a8fbbd053fee328986fadd8666d3058357ded56b9782f7d4f19931d178e" inherit systemd update-rc.d useradd diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb index 0d6e1a0b0..085807c4c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb @@ -31,8 +31,8 @@ SRC_URI_append_libc-musl = " \ file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ file://musl/0002-Fix-build-with-musl.patch \ " -SRC_URI[md5sum] = "ca1e6175c6ba97ca1adf65a67861ccd9" -SRC_URI[sha256sum] = "4dd97ca974cd1f97990746527258f551f4257cbf011fecd01d10b7d74a6fa5c3" +SRC_URI[md5sum] = "fc86588a3ae54e0d406b560a312d5a5d" +SRC_URI[sha256sum] = "a3bd07f695b6d3529ec6adbd9a1d6385b967e9c8ae90946f51d8852b320fd05e" S = "${WORKDIR}/NetworkManager-${PV}" diff --git a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb index 008a7ac9a..8523ae8c0 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.0.1.bb @@ -1,9 +1,3 @@ -python __anonymous() { - features = d.getVar('DISTRO_FEATURES') - if not features or 'systemd' not in features: - raise bb.parse.SkipPackage('networkd-dispatcher needs systemd in DISTRO_FEATURES') -} - SUMMARY = "Dispatcher service for systemd-networkd connection status changes" DESCRIPTION = "This daemon is similar to NetworkManager-dispatcher, but is much \ more limited in the types of events it supports due to the limited nature of \ @@ -13,12 +7,19 @@ AUTHOR = "Clayton Craft and others" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" -RDEPENDS_${PN} = "systemd python3 python3-pygobject python3-dbus" +inherit distro_features_check systemd + +RDEPENDS_${PN} = "python3-pygobject python3-dbus" +REQUIRED_DISTRO_FEATURES = "systemd" SRC_URI = "https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/${PV}/networkd-dispatcher-${PV}.tar.bz2" SRC_URI[md5sum] = "304d7dcc21331ea295e207f8493cb8d8" SRC_URI[sha256sum] = "21f84c3646a043329dc64787e4e58dfce592b2559b0e3069af82c469805660c2" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "networkd-dispatcher.service" +SYSTEMD_AUTO_ENABLE = "disable" + # Nothing to build, just a python script to install do_configure[noexec] = "1" do_compile[noexec] = "1" @@ -28,5 +29,3 @@ do_install() { install -D -m 0644 ${S}/networkd-dispatcher.service ${D}/${systemd_system_unitdir}/networkd-dispatcher.service install -D -m 0644 ${S}/networkd-dispatcher.conf ${D}/${sysconfdir}/conf.d/networkd-dispatcher.conf } - -FILES_${PN} += "${systemd_system_unitdir}/networkd-dispatcher.service" diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/bgpd.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/bgpd.service index 76f9f61e7..c1021fbd7 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/bgpd.service +++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/bgpd.service @@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/bgpd.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/bgpd.pid +PIDFile=/run/quagga/bgpd.pid ExecStart=@SBINDIR@/bgpd -d $bgpd_options -f @SYSCONFDIR@/quagga/bgpd.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/bgpd.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/bgpd.pid Restart=on-abort [Install] diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospf6d.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospf6d.service index a2e493b42..99d0e6dca 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospf6d.service +++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospf6d.service @@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ospf6d.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/ospf6d.pid +PIDFile=/run/quagga/ospf6d.pid ExecStart=@SBINDIR@/ospf6d -d $ospf6d_options -f @SYSCONFDIR@/quagga/ospf6d.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ospf6d.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/ospf6d.pid Restart=on-abort [Install] diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospfd.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospfd.service index 0c62cbce5..fe8343be1 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospfd.service +++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospfd.service @@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ospfd.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/ospfd.pid +PIDFile=/run/quagga/ospfd.pid ExecStart=@SBINDIR@/ospfd -d $ospfd_options -f @SYSCONFDIR@/quagga/ospfd.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ospfd.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/ospfd.pid Restart=on-abort [Install] diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripd.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripd.service index 1d20389e8..7af65ca8a 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripd.service +++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripd.service @@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ripd.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/ripd.pid +PIDFile=/run/quagga/ripd.pid ExecStart=@SBINDIR@/ripd -d $ripd_options -f @SYSCONFDIR@/quagga/ripd.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ripd.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/ripd.pid Restart=on-abort [Install] diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripngd.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripngd.service index 0355ad12a..9305f86be 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripngd.service +++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripngd.service @@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ripngd.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/ripngd.pid +PIDFile=/run/quagga/ripngd.pid ExecStart=@SBINDIR@/ripngd -d $ripngd_options -f @SYSCONFDIR@/quagga/ripngd.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ripngd.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/ripngd.pid Restart=on-abort [Install] diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/zebra.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/zebra.service index e4fb6c808..e34af7242 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/quagga/files/zebra.service +++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/zebra.service @@ -7,10 +7,10 @@ ConditionPathExists=@SYSCONFDIR@/quagga/zebra.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/zebra.pid +PIDFile=/run/quagga/zebra.pid ExecStartPre=@BASE_SBINDIR@/ip route flush proto zebra ExecStart=@SBINDIR@/zebra -d $zebra_options -f @SYSCONFDIR@/quagga/zebra.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/zebra.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/zebra.pid Restart=on-abort [Install] diff --git a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail/02_remove_SSLv3.patch b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail/02_remove_SSLv3.patch deleted file mode 100644 index 95cfa2f4a..000000000 --- a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail/02_remove_SSLv3.patch +++ /dev/null @@ -1,1576 +0,0 @@ -Description: <short summary of the patch> - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - fetchmail (6.3.26-2) unstable; urgency=low - . - * New maintainer (closes: #800750). - * Backport upstream fix for SSLv3 removal (closes: #804604) and do not - recommend SSLv3 (closes: #801178). - * Remove quilt and its usage. - * Add dh-python to build depends. - * Update upstream URLs. - * Update watch file. - * Update Standards-Version to 3.9.6 . -Author: Laszlo Boszormenyi (GCS) <gcs@debian.org> -Bug-Debian: https://bugs.debian.org/800750 -Bug-Debian: https://bugs.debian.org/801178 -Bug-Debian: https://bugs.debian.org/804604 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: https://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- fetchmail-6.3.26.orig/Makefile.am -+++ fetchmail-6.3.26/Makefile.am -@@ -31,7 +31,7 @@ libfm_a_SOURCES= xmalloc.c base64.c rfc8 - servport.c ntlm.h smbbyteorder.h smbdes.h smbmd4.h \ - smbencrypt.h smbdes.c smbencrypt.c smbmd4.c smbutil.c \ - libesmtp/gethostbyname.h libesmtp/gethostbyname.c \ -- smbtypes.h fm_getaddrinfo.c tls.c rfc822valid.c \ -+ smbtypes.h fm_getaddrinfo.c starttls.c rfc822valid.c \ - xmalloc.h sdump.h sdump.c x509_name_match.c \ - fm_strl.h md5c.c - if NTLM_ENABLE ---- fetchmail-6.3.26.orig/Makefile.in -+++ fetchmail-6.3.26/Makefile.in -@@ -97,14 +97,14 @@ am__libfm_a_SOURCES_DIST = xmalloc.c bas - rfc2047e.c servport.c ntlm.h smbbyteorder.h smbdes.h smbmd4.h \ - smbencrypt.h smbdes.c smbencrypt.c smbmd4.c smbutil.c \ - libesmtp/gethostbyname.h libesmtp/gethostbyname.c smbtypes.h \ -- fm_getaddrinfo.c tls.c rfc822valid.c xmalloc.h sdump.h sdump.c \ -+ fm_getaddrinfo.c starttls.c rfc822valid.c xmalloc.h sdump.h sdump.c \ - x509_name_match.c fm_strl.h md5c.c ntlmsubr.c - @NTLM_ENABLE_TRUE@am__objects_1 = ntlmsubr.$(OBJEXT) - am_libfm_a_OBJECTS = xmalloc.$(OBJEXT) base64.$(OBJEXT) \ - rfc822.$(OBJEXT) report.$(OBJEXT) rfc2047e.$(OBJEXT) \ - servport.$(OBJEXT) smbdes.$(OBJEXT) smbencrypt.$(OBJEXT) \ - smbmd4.$(OBJEXT) smbutil.$(OBJEXT) gethostbyname.$(OBJEXT) \ -- fm_getaddrinfo.$(OBJEXT) tls.$(OBJEXT) rfc822valid.$(OBJEXT) \ -+ fm_getaddrinfo.$(OBJEXT) starttls.$(OBJEXT) rfc822valid.$(OBJEXT) \ - sdump.$(OBJEXT) x509_name_match.$(OBJEXT) md5c.$(OBJEXT) \ - $(am__objects_1) - libfm_a_OBJECTS = $(am_libfm_a_OBJECTS) -@@ -483,7 +483,7 @@ libfm_a_SOURCES = xmalloc.c base64.c rfc - servport.c ntlm.h smbbyteorder.h smbdes.h smbmd4.h \ - smbencrypt.h smbdes.c smbencrypt.c smbmd4.c smbutil.c \ - libesmtp/gethostbyname.h libesmtp/gethostbyname.c smbtypes.h \ -- fm_getaddrinfo.c tls.c rfc822valid.c xmalloc.h sdump.h sdump.c \ -+ fm_getaddrinfo.c starttls.c rfc822valid.c xmalloc.h sdump.h sdump.c \ - x509_name_match.c fm_strl.h md5c.c $(am__append_1) - libfm_a_LIBADD = $(EXTRAOBJ) - libfm_a_DEPENDENCIES = $(EXTRAOBJ) ---- fetchmail-6.3.26.orig/NEWS -+++ fetchmail-6.3.26/NEWS -@@ -51,8 +51,6 @@ removed from a 6.4.0 or newer release.) - * The --bsmtp - mode of operation may be removed in a future release. - * Given that OpenSSL is severely underdocumented, and needs license exceptions, - fetchmail may switch to a different SSL library. --* SSLv2 support will be removed from a future fetchmail release. It has been -- obsolete for more than a decade. - - -------------------------------------------------------------------------------- - ---- fetchmail-6.3.26.orig/README.SSL -+++ fetchmail-6.3.26/README.SSL -@@ -11,36 +11,45 @@ specific to fetchmail. - In case of troubles, mail the README.SSL-SERVER file to your ISP and - have them check their server configuration against it. - --Unfortunately, fetchmail confuses SSL/TLS protocol levels with whether --a service needs to use in-band negotiation (STLS/STARTTLS for POP3/IMAP4) or is --totally SSL-wrapped on a separate port. For compatibility reasons, this cannot --be fixed in a bugfix release. -+Unfortunately, fetchmail confuses SSL/TLS protocol levels with whether a -+service needs to use in-band negotiation (STLS/STARTTLS for POP3/IMAP4) -+or is totally SSL-wrapped on a separate port. For compatibility -+reasons, this cannot be fixed in a bugfix or minor release. -+ -+Also, fetchmail 6.4.0 and newer releases changed some of the semantics -+as the result of a bug-fix, and will auto-negotiate TLSv1 or newer only. -+If your server does not support this, you may have to specify --sslproto -+ssl3. This is in order to prefer the newer TLS protocols, because SSLv2 -+and v3 are broken. - -- -- Matthias Andree, 2009-05-09 -+ -- Matthias Andree, 2015-01-16 - - - Quickstart - ---------- - -+Use an up-to-date release of OpenSSL 1.0.1 or newer, so as to get -+TLSv1.2 support. -+ - For use of SSL or TLS with in-band negotiation on the regular service's port, - i. e. with STLS or STARTTLS, use these command line options - -- --sslproto tls1 --sslcertck -+ --sslproto auto --sslcertck - - or these options in the rcfile (after the respective "user"... options) - -- sslproto tls1 sslcertck -+ sslproto auto sslcertck - - - For use of SSL or TLS on a separate port, if the whole TCP connection is --SSL-encrypted from the very beginning, use these command line options (in the --rcfile, omit all leading "--"): -+SSL-encrypted from the very beginning (SSL- or TLS-wrapped), use these -+command line options (in the rcfile, omit all leading "--"): - -- --ssl --sslproto ssl3 --sslcertck -+ --ssl --sslproto auto --sslcertck - - or these options in the rcfile (after the respective "user"... options) - -- ssl sslproto ssl3 sslcertck -+ ssl sslproto auto sslcertck - - - Background and use (long version :-)) ---- fetchmail-6.3.26.orig/config.h.in -+++ fetchmail-6.3.26/config.h.in -@@ -49,9 +49,9 @@ - don't. */ - #undef HAVE_DECL_H_ERRNO - --/* Define to 1 if you have the declaration of `SSLv2_client_method', and to 0 -+/* Define to 1 if you have the declaration of `SSLv3_client_method', and to 0 - if you don't. */ --#undef HAVE_DECL_SSLV2_CLIENT_METHOD -+#undef HAVE_DECL_SSLV3_CLIENT_METHOD - - /* Define to 1 if you have the declaration of `strerror', and to 0 if you - don't. */ ---- fetchmail-6.3.26.orig/configure -+++ fetchmail-6.3.26/configure -@@ -1,13 +1,11 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.68 for fetchmail 6.3.26. -+# Generated by GNU Autoconf 2.69 for fetchmail 6.3.26. - # - # Report bugs to <fetchmail-users@lists.berlios.de>. - # - # --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software --# Foundation, Inc. -+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. - # - # - # This configure script is free software; the Free Software Foundation -@@ -136,6 +134,31 @@ export LANGUAGE - # CDPATH. - (unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -+# Use a proper internal environment variable to ensure we don't fall -+ # into an infinite loop, continuously re-executing ourselves. -+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then -+ _as_can_reexec=no; export _as_can_reexec; -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+as_fn_exit 255 -+ fi -+ # We don't want this to propagate to other subprocesses. -+ { _as_can_reexec=; unset _as_can_reexec;} - if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : - emulate sh -@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test - else - exitcode=1; echo positional parameters were not saved. - fi --test x\$exitcode = x0 || exit 1" -+test x\$exitcode = x0 || exit 1 -+test -x / || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -@@ -214,21 +238,25 @@ IFS=$as_save_IFS - - - if test "x$CONFIG_SHELL" != x; then : -- # We cannot yet assume a decent shell, so we have to provide a -- # neutralization value for shells without unset; and this also -- # works around shells that cannot unset nonexistent variables. -- # Preserve -v and -x to the replacement shell. -- BASH_ENV=/dev/null -- ENV=/dev/null -- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -- export CONFIG_SHELL -- case $- in # (((( -- *v*x* | *x*v* ) as_opts=-vx ;; -- *v* ) as_opts=-v ;; -- *x* ) as_opts=-x ;; -- * ) as_opts= ;; -- esac -- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} -+ export CONFIG_SHELL -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+exit 255 - fi - - if test x$as_have_required = xno; then : -@@ -331,6 +359,14 @@ $as_echo X"$as_dir" | - - - } # as_fn_mkdir_p -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p - # as_fn_append VAR VALUE - # ---------------------- - # Append the text in VALUE to the end of the definition contained in VAR. Take -@@ -452,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - -+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have -+ # already done that, so ensure we don't try to do so again and fall -+ # in an infinite loop. This has already happened in practice. -+ _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). -@@ -486,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -+ # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file - rmdir conf$$.dir 2>/dev/null -@@ -507,28 +547,8 @@ else - as_mkdir_p=false - fi - --if test -x / >/dev/null 2>&1; then -- as_test_x='test -x' --else -- if ls -dL / >/dev/null 2>&1; then -- as_ls_L_option=L -- else -- as_ls_L_option= -- fi -- as_test_x=' -- eval sh -c '\'' -- if test -d "$1"; then -- test -d "$1/."; -- else -- case $1 in #( -- -*)set "./$1";; -- esac; -- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -- ???[sx]*):;;*)false;;esac;fi -- '\'' sh -- ' --fi --as_executable_p=$as_test_x -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -742,6 +762,7 @@ infodir - docdir - oldincludedir - includedir -+runstatedir - localstatedir - sharedstatedir - sysconfdir -@@ -841,6 +862,7 @@ datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' -+runstatedir='${localstatedir}/run' - includedir='${prefix}/include' - oldincludedir='/usr/include' - docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -@@ -1093,6 +1115,15 @@ do - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - -+ -runstatedir | --runstatedir | --runstatedi | --runstated \ -+ | --runstate | --runstat | --runsta | --runst | --runs \ -+ | --run | --ru | --r) -+ ac_prev=runstatedir ;; -+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ -+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ -+ | --run=* | --ru=* | --r=*) -+ runstatedir=$ac_optarg ;; -+ - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -@@ -1230,7 +1261,7 @@ fi - for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -- libdir localedir mandir -+ libdir localedir mandir runstatedir - do - eval ac_val=\$$ac_var - # Remove trailing slashes. -@@ -1258,8 +1289,6 @@ target=$target_alias - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used" >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -@@ -1385,6 +1414,7 @@ Fine tuning of the installation director - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] -@@ -1548,9 +1578,9 @@ test -n "$ac_init_help" && exit $ac_stat - if $ac_init_version; then - cat <<\_ACEOF - fetchmail configure 6.3.26 --generated by GNU Autoconf 2.68 -+generated by GNU Autoconf 2.69 - --Copyright (C) 2010 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -@@ -1827,7 +1857,7 @@ $as_echo "$ac_try_echo"; } >&5 - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -+ test -x conftest$ac_exeext - }; then : - ac_retval=0 - else -@@ -2030,7 +2060,8 @@ int - main () - { - static int test_array [1 - 2 * !(($2) >= 0)]; --test_array [0] = 0 -+test_array [0] = 0; -+return test_array [0]; - - ; - return 0; -@@ -2046,7 +2077,8 @@ int - main () - { - static int test_array [1 - 2 * !(($2) <= $ac_mid)]; --test_array [0] = 0 -+test_array [0] = 0; -+return test_array [0]; - - ; - return 0; -@@ -2072,7 +2104,8 @@ int - main () - { - static int test_array [1 - 2 * !(($2) < 0)]; --test_array [0] = 0 -+test_array [0] = 0; -+return test_array [0]; - - ; - return 0; -@@ -2088,7 +2121,8 @@ int - main () - { - static int test_array [1 - 2 * !(($2) >= $ac_mid)]; --test_array [0] = 0 -+test_array [0] = 0; -+return test_array [0]; - - ; - return 0; -@@ -2122,7 +2156,8 @@ int - main () - { - static int test_array [1 - 2 * !(($2) <= $ac_mid)]; --test_array [0] = 0 -+test_array [0] = 0; -+return test_array [0]; - - ; - return 0; -@@ -2195,7 +2230,7 @@ This file contains any messages produced - running configure, to aid debugging if configure makes a mistake. - - It was created by fetchmail $as_me 6.3.26, which was --generated by GNU Autoconf 2.68. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ - -@@ -2689,7 +2724,7 @@ case $as_dir/ in #(( - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. -@@ -2858,7 +2893,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2898,7 +2933,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2949,7 +2984,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do -- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue -+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ -@@ -3002,7 +3037,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3295,7 +3330,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3466,7 +3501,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3512,7 +3547,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3552,7 +3587,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3605,7 +3640,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3646,7 +3681,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -@@ -3704,7 +3739,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3748,7 +3783,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4194,8 +4229,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ - /* end confdefs.h. */ - #include <stdarg.h> - #include <stdio.h> --#include <sys/types.h> --#include <sys/stat.h> -+struct stat; - /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ - struct buf { int x; }; - FILE * (*rcsopen) (struct buf *, struct stat *, int); -@@ -4751,7 +4785,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4791,7 +4825,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4859,7 +4893,7 @@ do - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -+ as_fn_executable_p "$ac_path_GREP" || continue - # Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP - case `"$ac_path_GREP" --version 2>&1` in -@@ -4925,7 +4959,7 @@ do - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -+ as_fn_executable_p "$ac_path_EGREP" || continue - # Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP - case `"$ac_path_EGREP" --version 2>&1` in -@@ -5132,8 +5166,8 @@ else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --# define __EXTENSIONS__ 1 -- $ac_includes_default -+# define __EXTENSIONS__ 1 -+ $ac_includes_default - int - main () - { -@@ -5513,11 +5547,11 @@ else - int - main () - { --/* FIXME: Include the comments suggested by Paul. */ -+ - #ifndef __cplusplus -- /* Ultrix mips cc rejects this. */ -+ /* Ultrix mips cc rejects this sort of thing. */ - typedef int charset[2]; -- const charset cs; -+ const charset cs = { 0, 0 }; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *pcpcc; - char **ppc; -@@ -5534,8 +5568,9 @@ main () - ++pcpcc; - ppc = (char**) pcpcc; - pcpcc = (char const *const *) ppc; -- { /* SCO 3.2v4 cc rejects this. */ -- char *t; -+ { /* SCO 3.2v4 cc rejects this sort of thing. */ -+ char tx; -+ char *t = &tx; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; -@@ -5551,10 +5586,10 @@ main () - iptr p = 0; - ++p; - } -- { /* AIX XL C 1.02.0.0 rejects this saying -+ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ -- struct s { int j; const int *ap[3]; }; -- struct s *b; b->j = 5; -+ struct s { int j; const int *ap[3]; } bx; -+ struct s *b = &bx; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; -@@ -5600,7 +5635,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_LEX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -5632,7 +5667,8 @@ a { ECHO; } - b { REJECT; } - c { yymore (); } - d { yyless (1); } --e { yyless (input () != 0); } -+e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */ -+ yyless ((input () != 0)); } - f { unput (yytext[0]); } - . { BEGIN INITIAL; } - %% -@@ -5792,7 +5828,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_YACC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -6044,7 +6080,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -8548,7 +8584,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_procmail="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -8590,7 +8626,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_sendmail="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -8632,7 +8668,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_maildrop="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -10121,16 +10157,16 @@ $as_echo "$as_me: WARNING: Consider re-r - fi - - case "$LIBS" in *-lssl*) -- ac_fn_c_check_decl "$LINENO" "SSLv2_client_method" "ac_cv_have_decl_SSLv2_client_method" "#include <openssl/ssl.h> -+ ac_fn_c_check_decl "$LINENO" "SSLv3_client_method" "ac_cv_have_decl_SSLv3_client_method" "#include <openssl/ssl.h> - " --if test "x$ac_cv_have_decl_SSLv2_client_method" = xyes; then : -+if test "x$ac_cv_have_decl_SSLv3_client_method" = xyes; then : - ac_have_decl=1 - else - ac_have_decl=0 - fi - - cat >>confdefs.h <<_ACEOF --#define HAVE_DECL_SSLV2_CLIENT_METHOD $ac_have_decl -+#define HAVE_DECL_SSLV3_CLIENT_METHOD $ac_have_decl - _ACEOF - - ;; -@@ -11334,16 +11370,16 @@ if (echo >conf$$.file) 2>/dev/null; then - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -+ # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file - rmdir conf$$.dir 2>/dev/null -@@ -11403,28 +11439,16 @@ else - as_mkdir_p=false - fi - --if test -x / >/dev/null 2>&1; then -- as_test_x='test -x' --else -- if ls -dL / >/dev/null 2>&1; then -- as_ls_L_option=L -- else -- as_ls_L_option= -- fi -- as_test_x=' -- eval sh -c '\'' -- if test -d "$1"; then -- test -d "$1/."; -- else -- case $1 in #( -- -*)set "./$1";; -- esac; -- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -- ???[sx]*):;;*)false;;esac;fi -- '\'' sh -- ' --fi --as_executable_p=$as_test_x -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -11446,7 +11470,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri - # values after options handling. - ac_log=" - This file was extended by fetchmail $as_me 6.3.26, which was --generated by GNU Autoconf 2.68. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -11512,10 +11536,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ - ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ - fetchmail config.status 6.3.26 --configured by $0, generated by GNU Autoconf 2.68, -+configured by $0, generated by GNU Autoconf 2.69, - with options \\"\$ac_cs_config\\" - --Copyright (C) 2010 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - -@@ -11606,7 +11630,7 @@ fi - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' ---- fetchmail-6.3.26.orig/configure.ac -+++ fetchmail-6.3.26/configure.ac -@@ -802,7 +802,7 @@ else - fi - - case "$LIBS" in *-lssl*) -- AC_CHECK_DECLS([SSLv2_client_method],,,[#include <openssl/ssl.h>]) -+ AC_CHECK_DECLS([SSLv3_client_method],,,[#include <openssl/ssl.h>]) - ;; - esac - ---- fetchmail-6.3.26.orig/fetchmail-FAQ.html -+++ fetchmail-6.3.26/fetchmail-FAQ.html -@@ -667,8 +667,8 @@ because there is not currently a standar - also uses this method, so the two will interoperate happily. They - better, because this is how Craig gets his mail ;-)</p> - --<p>Finally, you can use <a href="#K5">SSL</a> for complete --end-to-end encryption if you have an SSL-enabled mailserver.</p> -+<p>Finally, you can use <a href="#K5">SSL or TLS</a> for complete -+end-to-end encryption if you have a TLS-enabled mailserver.</p> - - <h2><a id="G11" name="G11">G11. Is any special configuration needed - to use a dynamic IP address?</a></h2> -@@ -2120,7 +2120,7 @@ SSL?</a></h2> - - <p>You'll need to have the <a - href="http://www.openssl.org/">OpenSSL</a> libraries installed, and they --should at least be version 0.9.7. -+should at least be version 0.9.8, with 1.0.1 preferred. - Configure with --with-ssl. If you have the OpenSSL libraries - installed in commonly-used default locations, this will - suffice. If you have them installed in a non-default location, -@@ -2130,7 +2130,7 @@ to --with-ssl after an equal sign.</p> - <p>Fetchmail binaries built this way support <code>ssl</code>, - <code>sslkey</code>, and <code>sslcert</code> options that control - SSL encryption, and will automatically use <code>tls</code> if the --server offers it. You will need to have an SSL-enabled mailserver to -+server offers it. You will need to have an SSL/TLS-enabled mailserver to - use these options. See the manual page for details and some words - of care on the limited security provided.</p> - -@@ -2155,13 +2155,14 @@ poll MYSERVER port 993 plugin "openssl s - protocol imap username MYUSERNAME password MYPASSWORD - </pre> - --<p>You should note that SSL is only secure against a "man-in-the-middle" --attack if the client is able to verify that the peer's public key is the --correct one, and has not been substituted by an attacker. fetchmail can do --this in one of two ways: by verifying the SSL certificate, or by checking --the fingerprint of the peer's public key.</p> -+<p>You should note that SSL or TLS are only secure against a -+"man-in-the-middle" attack if the client is able to verify that the -+peer's public key is the correct one, and has not been substituted by an -+attacker. fetchmail can do this in one of two ways: by verifying the SSL -+certificate, or by checking the fingerprint of the peer's public -+key.</p> - --<p>There are three parts to SSL certificate verification: checking that the -+<p>There are three parts to TLS certificate verification: checking that the - domain name in the certificate matches the hostname you asked to connect to; - checking that the certificate expiry date has not passed; and checking that - the certificate has been signed by a known Certificate Authority (CA). This -@@ -2227,8 +2228,12 @@ will automatically attempt TLS negotiati - time. This can however cause problems if the upstream didn't configure - his certificates properly.</p> - --<p>In order to prevent fetchmail from trying TLS (STLS, STARTTLS) --negotiation, add this option:</p> -+<p>In order to prevent fetchmail 6.4.0 and newer versions from trying -+STLS or STARTTLS negotiation, add this option:</p> -+<pre>sslproto ''</pre> -+ -+<p>In order to prevent older fetchmail versions from trying TLS (STLS, STARTTLS) -+negotiation where the above does not work, try this option:</p> - - <pre>sslproto ssl23</pre> - -@@ -2876,15 +2881,22 @@ need to say something like '<code>envelo - - <pre> - Received: from send103.yahoomail.com (send103.yahoomail.com [205.180.60.92]) -- by iserv.ttns.net (8.8.5/8.8.5) with SMTP id RAA10088 -- for <ksturgeon@fbceg.org>; Wed, 9 Sep 1998 17:01:59 -0700 -+ by iserv.example.net (8.8.5/8.8.5) with SMTP id RAA10088 -+ for <ksturgeon@fbceg.example.org>; Wed, 9 Sep 1998 17:01:59 -0700 - </pre> - --<p>it checks to see if 'iserv.ttns.net' is a DNS alias of your --mailserver before accepting 'ksturgeon@fbceg.org' as an envelope -+<p>it checks to see if 'iserv.example.net' is a DNS alias of your -+mailserver before accepting 'ksturgeon@fbceg.example.org' as an envelope - address. This check might fail if your DNS were misconfigured, or --if you were using 'no dns' and had failed to declare iserv.ttns.net --as an alias of your server.</p> -+if you were using 'no dns' and had failed to declare iserv.example.net -+as an alias of your server. The typical hint is logging similar to: -+<code>line rejected, iserv.example.net is not an alias of the mailserver</code>, -+if you use fetchmail in verbose mode.</p> -+ -+<p><strong>Workaround:</strong> You can specify the alias explicitly, with <code>aka -+ <em>iserv.example.net</em></code> statements in the rcfile. Replace -+<em>iserv.example.net</em> by the name you find in <strong>your</strong> -+'by' part of the 'Received:' line.</p> - - <h2><a id="M8" name="M8">M8. Users are getting multiple copies of - messages.</a></h2> -@@ -3237,6 +3249,8 @@ Hayes mode escape "+++".</p> - <h2><a id="X8" name="X8">X8. A spurious ) is being appended to my - messages.</a></h2> - -+<p><em>Fetchmail 6.3.5 and newer releases are supposed to fix this.</em></p> -+ - <p>Due to the problem described in <a href="#S2">S2</a>, the - IMAP support in fetchmail cannot follow the IMAP protocol 100 %. - Most of the time it doesn't matter, but if you combine it with an -@@ -3279,8 +3293,6 @@ it at the end of the message it forwards - on, you'll get a message about actual != expected.</li> - </ol> - --<p>There is no fix for this.</p> -- - <h2><a id="X9" name="X9">X9. Missing "Content-Transfer-Encoding" header - with Domino IMAP</a></h2> - ---- fetchmail-6.3.26.orig/fetchmail.c -+++ fetchmail-6.3.26/fetchmail.c -@@ -54,6 +54,10 @@ - #define ENETUNREACH 128 /* Interactive doesn't know this */ - #endif /* ENETUNREACH */ - -+#ifdef SSL_ENABLE -+#include <openssl/ssl.h> /* for OPENSSL_NO_SSL2 and ..._SSL3 checks */ -+#endif -+ - /* prototypes for internal functions */ - static int load_params(int, char **, int); - static void dump_params (struct runctl *runp, struct query *, flag implicit); -@@ -138,7 +142,7 @@ static void printcopyright(FILE *fp) { - "Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n" - " Robert M. Funk, Graham Wilson\n" - "Copyright (C) 2005 - 2012 Sunil Shetye\n" -- "Copyright (C) 2005 - 2013 Matthias Andree\n" -+ "Copyright (C) 2005 - 2015 Matthias Andree\n" - )); - fprintf(fp, GT_("Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" - "are welcome to redistribute it under certain conditions. For details,\n" -@@ -262,6 +266,9 @@ int main(int argc, char **argv) - #endif /* ODMR_ENABLE */ - #ifdef SSL_ENABLE - "+SSL" -+#if (HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0) || defined(OPENSSL_NO_SSL3) -+ "-SSLv3" -+#endif - #endif - #ifdef OPIE_ENABLE - "+OPIE" ---- fetchmail-6.3.26.orig/fetchmail.h -+++ fetchmail-6.3.26/fetchmail.h -@@ -771,9 +771,9 @@ int servport(const char *service); - int fm_getaddrinfo(const char *node, const char *serv, const struct addrinfo *hints, struct addrinfo **res); - void fm_freeaddrinfo(struct addrinfo *ai); - --/* prototypes from tls.c */ --int maybe_tls(struct query *ctl); --int must_tls(struct query *ctl); -+/* prototypes from starttls.c */ -+int maybe_starttls(struct query *ctl); -+int must_starttls(struct query *ctl); - - /* prototype from rfc822valid.c */ - int rfc822_valid_msgid(const unsigned char *); ---- fetchmail-6.3.26.orig/fetchmail.man -+++ fetchmail-6.3.26/fetchmail.man -@@ -412,23 +412,22 @@ from. The folder information is written - .B \-\-ssl - (Keyword: ssl) - .br --Causes the connection to the mail server to be encrypted --via SSL. Connect to the server using the specified base protocol over a --connection secured by SSL. This option defeats opportunistic starttls --negotiation. It is highly recommended to use \-\-sslproto 'SSL3' --\-\-sslcertck to validate the certificates presented by the server and --defeat the obsolete SSLv2 negotiation. More information is available in --the \fIREADME.SSL\fP file that ships with fetchmail. --.IP --Note that fetchmail may still try to negotiate SSL through starttls even --if this option is omitted. You can use the \-\-sslproto option to defeat --this behavior or tell fetchmail to negotiate a particular SSL protocol. -+Causes the connection to the mail server to be encrypted via SSL, by -+negotiating SSL directly after connecting (SSL-wrapped mode). It is -+highly recommended to use \-\-sslcertck to validate the certificates -+presented by the server. Please see the description of \-\-sslproto -+below! More information is available in the \fIREADME.SSL\fP file that -+ships with fetchmail. -+.IP -+Note that even if this option is omitted, fetchmail may still negotiate -+SSL in-band for POP3 or IMAP, through the STLS or STARTTLS feature. You -+can use the \-\-sslproto option to modify that behavior. - .IP - If no port is specified, the connection is attempted to the well known - port of the SSL version of the base protocol. This is generally a - different port than the port used by the base protocol. For IMAP, this - is port 143 for the clear protocol and port 993 for the SSL secured --protocol, for POP3, it is port 110 for the clear text and port 995 for -+protocol; for POP3, it is port 110 for the clear text and port 995 for - the encrypted variant. - .IP - If your system lacks the corresponding entries from /etc/services, see -@@ -470,39 +469,73 @@ cause some complications in daemon mode. - .IP - Also see \-\-sslcert above. - .TP --.B \-\-sslproto <name> --(Keyword: sslproto) -+.B \-\-sslproto <value> -+(Keyword: sslproto, NOTE: semantic changes since v6.4.0) - .br --Forces an SSL/TLS protocol. Possible values are \fB''\fP, --\&'\fBSSL2\fP' (not supported on all systems), --\&'\fBSSL23\fP', (use of these two values is discouraged --and should only be used as a last resort) \&'\fBSSL3\fP', and --\&'\fBTLS1\fP'. The default behaviour if this option is unset is: for --connections without \-\-ssl, use \&'\fBTLS1\fP' so that fetchmail will --opportunistically try STARTTLS negotiation with TLS1. You can configure --this option explicitly if the default handshake (TLS1 if \-\-ssl is not --used) does not work for your server. --.IP --Use this option with '\fBTLS1\fP' value to enforce a STARTTLS --connection. In this mode, it is highly recommended to also use --\-\-sslcertck (see below). Note that this will then cause fetchmail --v6.3.19 to force STARTTLS negotiation even if it is not advertised by --the server. --.IP --To defeat opportunistic TLSv1 negotiation when the server advertises --STARTTLS or STLS, and use a cleartext connection use \fB''\fP. This --option, even if the argument is the empty string, will also suppress the --diagnostic 'SERVER: opportunistic upgrade to TLS.' message in verbose --mode. The default is to try appropriate protocols depending on context. -+This option has a dual use, out of historic fetchmail behaviour. It -+controls both the SSL/TLS protocol version and, if \-\-ssl is not -+specified, the STARTTLS behaviour (upgrading the protocol to an SSL or -+TLS connection in-band). Some other options may however make TLS -+mandatory. -+.PP -+Only if this option and \-\-ssl are both missing for a poll, there will -+be opportunistic TLS for POP3 and IMAP, where fetchmail will attempt to -+upgrade to TLSv1 or newer. -+.PP -+Recognized values for \-\-sslproto are given below. You should normally -+chose one of the auto-negotiating options, i. e. '\fBauto\fP' or one of -+the options ending in a plus (\fB+\fP) character. Note that depending -+on OpenSSL library version and configuration, some options cause -+run-time errors because the requested SSL or TLS versions are not -+supported by the particular installed OpenSSL library. -+.RS -+.IP "\fB''\fP, the empty string" -+Disable STARTTLS. If \-\-ssl is given for the same server, log an error -+and pretend that '\fBauto\fP' had been used instead. -+.IP '\fBauto\fP' -+(default). Since v6.4.0. Require TLS. Auto-negotiate TLSv1 or newer, disable SSLv3 downgrade. -+(fetchmail 6.3.26 and older have auto-negotiated all protocols that -+their OpenSSL library supported, including the broken SSLv3). -+.IP "\&'\fBSSL23\fP' -+see '\fBauto\fP'. -+.IP \&'\fBSSL3\fP' -+Require SSLv3 exactly. SSLv3 is broken, not supported on all systems, avoid it -+if possible. This will make fetchmail negotiate SSLv3 only, and is the -+only way besides '\fBSSL3+\fP' to have fetchmail 6.4.0 or newer permit SSLv3. -+.IP \&'\fBSSL3+\fP' -+same as '\fBauto\fP', but permit SSLv3 as well. This is the only way -+besides '\fBSSL3\fP' to have fetchmail 6.4.0 or newer permit SSLv3. -+.IP \&'\fBTLS1\fP' -+Require TLSv1. This does not negotiate TLSv1.1 or newer, and is -+discouraged. Replace by TLS1+ unless the latter chokes your server. -+.IP \&'\fBTLS1+\fP' -+Since v6.4.0. See 'fBauto\fP'. -+.IP \&'\fBTLS1.1\fP' -+Since v6.4.0. Require TLS v1.1 exactly. -+.IP \&'\fBTLS1.1+\fP' -+Since v6.4.0. Require TLS. Auto-negotiate TLSv1.1 or newer. -+.IP \&'\fBTLS1.2\fP' -+Since v6.4.0. Require TLS v1.2 exactly. -+.IP '\fBTLS1.2+\fP' -+Since v6.4.0. Require TLS. Auto-negotiate TLSv1.2 or newer. -+.IP "Unrecognized parameters" -+are treated the same as '\fBauto\fP'. -+.RE -+.IP -+NOTE: you should hardly ever need to use anything other than '' (to -+force an unencrypted connection) or 'auto' (to enforce TLS). - .TP - .B \-\-sslcertck - (Keyword: sslcertck) - .br --Causes fetchmail to strictly check the server certificate against a set of --local trusted certificates (see the \fBsslcertfile\fP and \fBsslcertpath\fP --options). If the server certificate cannot be obtained or is not signed by one --of the trusted ones (directly or indirectly), the SSL connection will fail, --regardless of the \fBsslfingerprint\fP option. -+Causes fetchmail to require that SSL/TLS be used and disconnect if it -+can not successfully negotiate SSL or TLS, or if it cannot successfully -+verify and validate the certificate and follow it to a trust anchor (or -+trusted root certificate). The trust anchors are given as a set of local -+trusted certificates (see the \fBsslcertfile\fP and \fBsslcertpath\fP -+options). If the server certificate cannot be obtained or is not signed -+by one of the trusted ones (directly or indirectly), fetchmail will -+disconnect, regardless of the \fBsslfingerprint\fP option. - .IP - Note that CRL (certificate revocation lists) are only supported in - OpenSSL 0.9.7 and newer! Your system clock should also be reasonably -@@ -1202,31 +1235,33 @@ capability response. Specify a user opti - username and the part to the right as the NTLM domain. - - .SS Secure Socket Layers (SSL) and Transport Layer Security (TLS) -+.PP All retrieval protocols can use SSL or TLS wrapping for the -+transport. Additionally, POP3 and IMAP retrival can also negotiate -+SSL/TLS by means of STARTTLS (or STLS). - .PP - Note that fetchmail currently uses the OpenSSL library, which is - severely underdocumented, so failures may occur just because the - programmers are not aware of OpenSSL's requirement of the day. - For instance, since v6.3.16, fetchmail calls - OpenSSL_add_all_algorithms(), which is necessary to support certificates --using SHA256 on OpenSSL 0.9.8 -- this information is deeply hidden in the --documentation and not at all obvious. Please do not hesitate to report --subtle SSL failures. --.PP --You can access SSL encrypted services by specifying the \-\-ssl option. --You can also do this using the "ssl" user option in the .fetchmailrc --file. With SSL encryption enabled, queries are initiated over a --connection after negotiating an SSL session, and the connection fails if --SSL cannot be negotiated. Some services, such as POP3 and IMAP, have -+using SHA256 on OpenSSL 0.9.8 -- this information is deeply hidden in -+the documentation and not at all obvious. Please do not hesitate to -+report subtle SSL failures. -+.PP -+You can access SSL encrypted services by specifying the options starting -+with \-\-ssl, such as \-\-ssl, \-\-sslproto, \-\-sslcertck, and others. -+You can also do this using the corresponding user options in the .fetchmailrc -+file. Some services, such as POP3 and IMAP, have - different well known ports defined for the SSL encrypted services. The - encrypted ports will be selected automatically when SSL is enabled and --no explicit port is specified. The \-\-sslproto 'SSL3' option should be --used to select the SSLv3 protocol (default if unset: v2 or v3). Also, --the \-\-sslcertck command line or sslcertck run control file option --should be used to force strict certificate checking - see below. -+no explicit port is specified. Also, the \-\-sslcertck command line or -+sslcertck run control file option should be used to force strict -+certificate checking - see below. - .PP - If SSL is not configured, fetchmail will usually opportunistically try to use --STARTTLS. STARTTLS can be enforced by using \-\-sslproto "TLS1". TLS --connections use the same port as the unencrypted version of the -+STARTTLS. STARTTLS can be enforced by using \-\-sslproto\~auto and -+defeated by using \-\-sslproto\~''. -+TLS connections use the same port as the unencrypted version of the - protocol and negotiate TLS via special command. The \-\-sslcertck - command line or sslcertck run control file option should be used to - force strict certificate checking - see below. ---- fetchmail-6.3.26.orig/imap.c -+++ fetchmail-6.3.26/imap.c -@@ -405,6 +405,8 @@ static int imap_getauth(int sock, struct - /* apply for connection authorization */ - { - int ok = 0; -+ char *commonname; -+ - (void)greeting; - - /* -@@ -429,25 +431,21 @@ static int imap_getauth(int sock, struct - return(PS_SUCCESS); - } - --#ifdef SSL_ENABLE -- if (maybe_tls(ctl)) { -- char *commonname; -- -- commonname = ctl->server.pollname; -- if (ctl->server.via) -- commonname = ctl->server.via; -- if (ctl->sslcommonname) -- commonname = ctl->sslcommonname; -+ commonname = ctl->server.pollname; -+ if (ctl->server.via) -+ commonname = ctl->server.via; -+ if (ctl->sslcommonname) -+ commonname = ctl->sslcommonname; - -- if (strstr(capabilities, "STARTTLS") -- || must_tls(ctl)) /* if TLS is mandatory, ignore capabilities */ -+#ifdef SSL_ENABLE -+ if (maybe_starttls(ctl)) { -+ if ((strstr(capabilities, "STARTTLS") && maybe_starttls(ctl)) -+ || must_starttls(ctl)) /* if TLS is mandatory, ignore capabilities */ - { -- /* Use "tls1" rather than ctl->sslproto because tls1 is the only -- * protocol that will work with STARTTLS. Don't need to worry -- * whether TLS is mandatory or opportunistic unless SSLOpen() fails -- * (see below). */ -+ /* Don't need to worry whether TLS is mandatory or -+ * opportunistic unless SSLOpen() fails (see below). */ - if (gen_transact(sock, "STARTTLS") == PS_SUCCESS -- && (set_timeout(mytimeout), SSLOpen(sock, ctl->sslcert, ctl->sslkey, "tls1", ctl->sslcertck, -+ && (set_timeout(mytimeout), SSLOpen(sock, ctl->sslcert, ctl->sslkey, ctl->sslproto, ctl->sslcertck, - ctl->sslcertfile, ctl->sslcertpath, ctl->sslfingerprint, commonname, - ctl->server.pollname, &ctl->remotename)) != -1) - { -@@ -470,7 +468,7 @@ static int imap_getauth(int sock, struct - { - report(stdout, GT_("%s: upgrade to TLS succeeded.\n"), commonname); - } -- } else if (must_tls(ctl)) { -+ } else if (must_starttls(ctl)) { - /* Config required TLS but we couldn't guarantee it, so we must - * stop. */ - set_timeout(0); -@@ -492,6 +490,10 @@ static int imap_getauth(int sock, struct - /* Usable. Proceed with authenticating insecurely. */ - } - } -+ } else { -+ if (strstr(capabilities, "STARTTLS") && outlevel >= O_VERBOSE) { -+ report(stdout, GT_("%s: WARNING: server offered STARTTLS but sslproto '' given.\n"), commonname); -+ } - } - #endif /* SSL_ENABLE */ - ---- fetchmail-6.3.26.orig/po/Makevars -+++ fetchmail-6.3.26/po/Makevars -@@ -46,3 +46,15 @@ MSGID_BUGS_ADDRESS = fetchmail-devel@lis - # This is the list of locale categories, beyond LC_MESSAGES, for which the - # message catalogs shall be used. It is usually empty. - EXTRA_LOCALE_CATEGORIES = -+ -+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' -+# context. Possible values are "yes" and "no". Set this to yes if the -+# package uses functions taking also a message context, like pgettext(), or -+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. -+USE_MSGCTXT = no -+ -+# These options get passed to msgmerge. -+# Useful options are in particular: -+# --previous to keep previous msgids of translated messages, -+# --quiet to reduce the verbosity. -+MSGMERGE_OPTIONS = ---- fetchmail-6.3.26.orig/pop3.c -+++ fetchmail-6.3.26/pop3.c -@@ -281,6 +281,7 @@ static int pop3_getauth(int sock, struct - #endif /* OPIE_ENABLE */ - #ifdef SSL_ENABLE - flag connection_may_have_tls_errors = FALSE; -+ char *commonname; - #endif /* SSL_ENABLE */ - - done_capa = FALSE; -@@ -393,7 +394,7 @@ static int pop3_getauth(int sock, struct - (ctl->server.authenticate == A_KERBEROS_V5) || - (ctl->server.authenticate == A_OTP) || - (ctl->server.authenticate == A_CRAM_MD5) || -- maybe_tls(ctl)) -+ maybe_starttls(ctl)) - { - if ((ok = capa_probe(sock)) != PS_SUCCESS) - /* we are in STAGE_GETAUTH => failure is PS_AUTHFAIL! */ -@@ -406,12 +407,12 @@ static int pop3_getauth(int sock, struct - (ok == PS_SOCKET && !ctl->wehaveauthed)) - { - #ifdef SSL_ENABLE -- if (must_tls(ctl)) { -+ if (must_starttls(ctl)) { - /* fail with mandatory STLS without repoll */ - report(stderr, GT_("TLS is mandatory for this session, but server refused CAPA command.\n")); - report(stderr, GT_("The CAPA command is however necessary for TLS.\n")); - return ok; -- } else if (maybe_tls(ctl)) { -+ } else if (maybe_starttls(ctl)) { - /* defeat opportunistic STLS */ - xfree(ctl->sslproto); - ctl->sslproto = xstrdup(""); -@@ -431,24 +432,19 @@ static int pop3_getauth(int sock, struct - } - - #ifdef SSL_ENABLE -- if (maybe_tls(ctl)) { -- char *commonname; -+ commonname = ctl->server.pollname; -+ if (ctl->server.via) -+ commonname = ctl->server.via; -+ if (ctl->sslcommonname) -+ commonname = ctl->sslcommonname; - -- commonname = ctl->server.pollname; -- if (ctl->server.via) -- commonname = ctl->server.via; -- if (ctl->sslcommonname) -- commonname = ctl->sslcommonname; -- -- if (has_stls -- || must_tls(ctl)) /* if TLS is mandatory, ignore capabilities */ -+ if (maybe_starttls(ctl)) { -+ if (has_stls || must_starttls(ctl)) /* if TLS is mandatory, ignore capabilities */ - { -- /* Use "tls1" rather than ctl->sslproto because tls1 is the only -- * protocol that will work with STARTTLS. Don't need to worry -- * whether TLS is mandatory or opportunistic unless SSLOpen() fails -- * (see below). */ -+ /* Don't need to worry whether TLS is mandatory or -+ * opportunistic unless SSLOpen() fails (see below). */ - if (gen_transact(sock, "STLS") == PS_SUCCESS -- && (set_timeout(mytimeout), SSLOpen(sock, ctl->sslcert, ctl->sslkey, "tls1", ctl->sslcertck, -+ && (set_timeout(mytimeout), SSLOpen(sock, ctl->sslcert, ctl->sslkey, ctl->sslproto, ctl->sslcertck, - ctl->sslcertfile, ctl->sslcertpath, ctl->sslfingerprint, commonname, - ctl->server.pollname, &ctl->remotename)) != -1) - { -@@ -475,7 +471,7 @@ static int pop3_getauth(int sock, struct - { - report(stdout, GT_("%s: upgrade to TLS succeeded.\n"), commonname); - } -- } else if (must_tls(ctl)) { -+ } else if (must_starttls(ctl)) { - /* Config required TLS but we couldn't guarantee it, so we must - * stop. */ - set_timeout(0); -@@ -495,7 +491,11 @@ static int pop3_getauth(int sock, struct - } - } - } -- } /* maybe_tls() */ -+ } else { /* maybe_starttls() */ -+ if (has_stls && outlevel >= O_VERBOSE) { -+ report(stdout, GT_("%s: WARNING: server offered STLS, but sslproto '' given.\n"), commonname); -+ } -+ } /* maybe_starttls() */ - #endif /* SSL_ENABLE */ - - /* ---- fetchmail-6.3.26.orig/socket.c -+++ fetchmail-6.3.26/socket.c -@@ -876,7 +876,9 @@ int SSLOpen(int sock, char *mycert, char - { - struct stat randstat; - int i; -+ int avoid_ssl_versions = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; - long sslopts = SSL_OP_ALL; -+ int ssle_connect = 0; - - SSL_load_error_strings(); - SSL_library_init(); -@@ -906,25 +908,57 @@ int SSLOpen(int sock, char *mycert, char - /* Make sure a connection referring to an older context is not left */ - _ssl_context[sock] = NULL; - if(myproto) { -- if(!strcasecmp("ssl2",myproto)) { --#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0 -- _ctx[sock] = SSL_CTX_new(SSLv2_client_method()); -+ if(!strcasecmp("ssl3",myproto)) { -+#if (HAVE_DECL_SSLV3_CLIENT_METHOD > 0) && (0 == OPENSSL_NO_SSL3 + 0) -+ _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); -+ avoid_ssl_versions &= ~SSL_OP_NO_SSLv3; - #else -- report(stderr, GT_("Your operating system does not support SSLv2.\n")); -+ report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n")); - return -1; - #endif -- } else if(!strcasecmp("ssl3",myproto)) { -- _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); -+ } else if(!strcasecmp("ssl3+",myproto)) { -+ avoid_ssl_versions &= ~SSL_OP_NO_SSLv3; -+ myproto = NULL; - } else if(!strcasecmp("tls1",myproto)) { - _ctx[sock] = SSL_CTX_new(TLSv1_client_method()); -- } else if (!strcasecmp("ssl23",myproto)) { -+ } else if(!strcasecmp("tls1+",myproto)) { -+ myproto = NULL; -+#if defined(TLS1_1_VERSION) && TLS_MAX_VERSION >= TLS1_1_VERSION -+ } else if(!strcasecmp("tls1.1",myproto)) { -+ _ctx[sock] = SSL_CTX_new(TLSv1_1_client_method()); -+ } else if(!strcasecmp("tls1.1+",myproto)) { -+ myproto = NULL; -+ avoid_ssl_versions |= SSL_OP_NO_TLSv1; -+#else -+ } else if(!strcasecmp("tls1.1",myproto) || !strcasecmp("tls1.1+", myproto)) { -+ report(stderr, GT_("Your OpenSSL version does not support TLS v1.1.\n")); -+ return -1; -+#endif -+#if defined(TLS1_2_VERSION) && TLS_MAX_VERSION >= TLS1_2_VERSION -+ } else if(!strcasecmp("tls1.2",myproto)) { -+ _ctx[sock] = SSL_CTX_new(TLSv1_2_client_method()); -+ } else if(!strcasecmp("tls1.2+",myproto)) { -+ myproto = NULL; -+ avoid_ssl_versions |= SSL_OP_NO_TLSv1; -+ avoid_ssl_versions |= SSL_OP_NO_TLSv1_1; -+#else -+ } else if(!strcasecmp("tls1.2",myproto) || !strcasecmp("tls1.2+", myproto)) { -+ report(stderr, GT_("Your OpenSSL version does not support TLS v1.2.\n")); -+ return -1; -+#endif -+ } else if (!strcasecmp("ssl23",myproto) || 0 == strcasecmp("auto",myproto)) { - myproto = NULL; - } else { -- report(stderr,GT_("Invalid SSL protocol '%s' specified, using default (SSLv23).\n"), myproto); -+ report(stderr,GT_("Invalid SSL protocol '%s' specified, using default autoselect (SSL23).\n"), myproto); - myproto = NULL; - } - } -- if(!myproto) { -+ // do not combine into an else { } as myproto may be nulled -+ // above! -+ if (!myproto) { -+ // SSLv23 is a misnomer and will in fact use the best -+ // available protocol, subject to SSL_OP_NO* -+ // constraints. - _ctx[sock] = SSL_CTX_new(SSLv23_client_method()); - } - if(_ctx[sock] == NULL) { -@@ -938,7 +972,7 @@ int SSLOpen(int sock, char *mycert, char - sslopts &= ~ SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS; - } - -- SSL_CTX_set_options(_ctx[sock], sslopts); -+ SSL_CTX_set_options(_ctx[sock], sslopts | avoid_ssl_versions); - - if (certck) { - SSL_CTX_set_verify(_ctx[sock], SSL_VERIFY_PEER, SSL_ck_verify_callback); -@@ -1008,8 +1042,18 @@ int SSLOpen(int sock, char *mycert, char - } - - if (SSL_set_fd(_ssl_context[sock], sock) == 0 -- || SSL_connect(_ssl_context[sock]) < 1) { -+ || (ssle_connect = SSL_connect(_ssl_context[sock])) < 1) { -+ int e = errno; -+ unsigned long ssle_err_from_queue = ERR_peek_error(); -+ unsigned long ssle_err_from_get_error = SSL_get_error(_ssl_context[sock], ssle_connect); - ERR_print_errors_fp(stderr); -+ if (SSL_ERROR_SYSCALL == ssle_err_from_get_error && 0 == ssle_err_from_queue) { -+ if (0 == ssle_connect) { -+ report(stderr, GT_("Server shut down connection prematurely during SSL_connect().\n")); -+ } else if (ssle_connect < 0) { -+ report(stderr, GT_("System error during SSL_connect(): %s\n"), strerror(e)); -+ } -+ } - SSL_free( _ssl_context[sock] ); - _ssl_context[sock] = NULL; - SSL_CTX_free(_ctx[sock]); -@@ -1017,6 +1061,24 @@ int SSLOpen(int sock, char *mycert, char - return(-1); - } - -+ if (outlevel >= O_VERBOSE) { -+ SSL_CIPHER const *sc; -+ int bitsmax, bitsused; -+ -+ const char *ver; -+ -+ ver = SSL_get_version(_ssl_context[sock]); -+ -+ sc = SSL_get_current_cipher(_ssl_context[sock]); -+ if (!sc) { -+ report (stderr, GT_("Cannot obtain current SSL/TLS cipher - no session established?\n")); -+ } else { -+ bitsused = SSL_CIPHER_get_bits(sc, &bitsmax); -+ report(stdout, GT_("SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"), -+ ver, SSL_CIPHER_get_name(sc), bitsused, bitsmax); -+ } -+ } -+ - /* Paranoia: was the callback not called as we expected? */ - if (!_depth0ck) { - report(stderr, GT_("Certificate/fingerprint verification was somehow skipped!\n")); ---- /dev/null -+++ fetchmail-6.3.26/starttls.c -@@ -0,0 +1,37 @@ -+/** \file tls.c - collect common TLS functionality -+ * \author Matthias Andree -+ * \date 2006 -+ */ -+ -+#include "fetchmail.h" -+ -+#include <string.h> -+ -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+ -+/** return true if user allowed opportunistic STARTTLS/STLS */ -+int maybe_starttls(struct query *ctl) { -+#ifdef SSL_ENABLE -+ /* opportunistic or forced TLS */ -+ return (!ctl->sslproto || strlen(ctl->sslproto)) -+ && !ctl->use_ssl; -+#else -+ (void)ctl; -+ return 0; -+#endif -+} -+ -+/** return true if user requires STARTTLS/STLS, note though that this -+ * code must always use a logical AND with maybe_tls(). */ -+int must_starttls(struct query *ctl) { -+#ifdef SSL_ENABLE -+ return maybe_starttls(ctl) -+ && (ctl->sslfingerprint || ctl->sslcertck -+ || (ctl->sslproto && !strcasecmp(ctl->sslproto, "tls1"))); -+#else -+ (void)ctl; -+ return 0; -+#endif -+} diff --git a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.3.26.bb b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.1.bb index 5af5d0df6..21caa918a 100644 --- a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.3.26.bb +++ b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.1.bb @@ -3,15 +3,14 @@ HOMEPAGE = "http://www.fetchmail.info/" DESCRIPTION = "Fetchmail is a full-featured, robust, well-documented remote-mail retrieval and forwarding utility intended to be used over on-demand TCP/IP links (such as SLIP or PPP connections). It supports every remote-mail protocol now in use on the Internet: POP2, POP3, RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC." SECTION = "mail" LICENSE = "GPLv2 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbb509e0303f5ded1cbfc0cc8705f28c" +LIC_FILES_CHKSUM = "file://COPYING;md5=ca53985c1fd053ae0bffffaa89ed49f1" DEPENDS = "openssl" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz \ - file://02_remove_SSLv3.patch \ " -SRC_URI[md5sum] = "61b66faad044afa26e142bb1791aa2b3" -SRC_URI[sha256sum] = "79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850" +SRC_URI[md5sum] = "c2b836a919cdd4ec53b06b70e0aa3e63" +SRC_URI[sha256sum] = "3f33f11dd08c3e8cc3e9d18eec686b1626d4818f4d5a72791507bbc4dce6a9a0" inherit autotools gettext python-dir pythonnative diff --git a/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb index 22cb88ac1..b375ca94e 100644 --- a/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb +++ b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.30.bb @@ -34,7 +34,9 @@ do_compile() { } do_install() { - sed -i -e "s;SBIN\t\t= \$(BUILD_ROOT)/sbin;SBIN\t\t= \$(BUILD_ROOT)/$base_sbindir;" ${S}/Makefile + sed -i -e "s;SBIN\t\t= \$(BUILD_ROOT)/sbin;SBIN\t\t= \$(BUILD_ROOT)$base_sbindir;" \ + -e "s;INIT\t\t= \$(BUILD_ROOT)/etc/rc.d/init.d;INIT\t\t= \$(BUILD_ROOT)${sysconfdir}/init.d;" \ + ${S}/Makefile oe_runmake 'BUILD_ROOT=${D}' install } diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb index 5408eed27..b521633ff 100644 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb @@ -28,6 +28,7 @@ PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \ ${@bb.utils.filter('DISTRO_FEATURES', 'ldap', d)} \ " PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni" +PACKAGECONFIG[bfd] = "--enable-bfd-backtraces,--disable-bfd-backtraces,binutils" PACKAGECONFIG[charon] = "--enable-charon,--disable-charon," PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,${PN}-plugin-curl" PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch deleted file mode 100644 index 919f2b009..000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-CVE-2017-16808-AoE-Add-a-missing-bounds-check.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c45443a0d3e16b92622bea6b589e5930e8f0d815 Mon Sep 17 00:00:00 2001 -From: Peiran Hong <peiran.hong@windriver.com> -Date: Fri, 13 Sep 2019 17:02:57 -0400 -Subject: [PATCH] CVE-2017-16808/AoE: Add a missing bounds check. - ---- - netdissect.h | 12 ++++++++++++ - print-aoe.c | 1 + - 2 files changed, 13 insertions(+) - -diff --git a/netdissect.h b/netdissect.h -index 089b0406..cd05fdb9 100644 ---- a/netdissect.h -+++ b/netdissect.h -@@ -69,6 +69,11 @@ typedef struct { - typedef unsigned char nd_uint8_t; - typedef signed char nd_int8_t; - -+/* -+ * Use this for MAC addresses. -+ */ -+#define MAC_ADDR_LEN 6 /* length of MAC addresses */ -+ - /* snprintf et al */ - - #include <stdarg.h> -@@ -309,12 +314,19 @@ struct netdissect_options { - ((uintptr_t)ndo->ndo_snapend - (l) <= (uintptr_t)ndo->ndo_snapend && \ - (uintptr_t)&(var) <= (uintptr_t)ndo->ndo_snapend - (l))) - -+#define ND_TTEST_LEN(p, l) \ -+ (IS_NOT_NEGATIVE(l) && \ -+ ((uintptr_t)ndo->ndo_snapend - (l) <= (uintptr_t)ndo->ndo_snapend && \ -+ (uintptr_t)(p) <= (uintptr_t)ndo->ndo_snapend - (l))) -+ - /* True if "var" was captured */ - #define ND_TTEST(var) ND_TTEST2(var, sizeof(var)) - - /* Bail if "l" bytes of "var" were not captured */ - #define ND_TCHECK2(var, l) if (!ND_TTEST2(var, l)) goto trunc - -+#define ND_TCHECK_LEN(p, l) if (!ND_TTEST_LEN(p, l)) goto trunc -+ - /* Bail if "var" was not captured */ - #define ND_TCHECK(var) ND_TCHECK2(var, sizeof(var)) - -diff --git a/print-aoe.c b/print-aoe.c -index 97e93df2..ac097a04 100644 ---- a/print-aoe.c -+++ b/print-aoe.c -@@ -325,6 +325,7 @@ aoev1_reserve_print(netdissect_options *ndo, - goto invalid; - /* addresses */ - for (i = 0; i < nmacs; i++) { -+ ND_TCHECK_LEN(cp, MAC_ADDR_LEN); - ND_PRINT((ndo, "\n\tEthernet Address %u: %s", i, etheraddr_string(ndo, cp))); - cp += ETHER_ADDR_LEN; - } --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb index 256d83f03..92c902b75 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/linux-nvme/nvme-cli" SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" -DEPENDS = "util-linux util-linux-native" +DEPENDS = "util-linux" PV .= "+git${SRCPV}" SRC_URI = "git://github.com/linux-nvme/nvme-cli.git" @@ -15,15 +15,19 @@ S = "${WORKDIR}/git" inherit bash-completion systemd do_install() { - oe_runmake install DESTDIR=${D} PREFIX=${prefix} \ + oe_runmake install-spec DESTDIR=${D} PREFIX=${prefix} \ UDEVDIR=${nonarch_base_libdir}/udev SYSTEMDDIR=${systemd_unitdir} } pkg_postinst_ontarget_${PN}() { ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn + ${bindir}/uuidgen > ${sysconfdir}/nvme/hostid } PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion" +FILES_${PN} += "${systemd_system_unitdir}" FILES_${PN}-dracut = "${libdir}/dracut/dracut.conf.d" FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" + +RDEPENDS_${PN} = "util-linux-uuidgen" diff --git a/meta-openembedded/meta-oe/recipes-bsp/rwmem/rwmem_1.2.bb b/meta-openembedded/meta-oe/recipes-bsp/rwmem/rwmem_1.2.bb index 0a15134df..5d81fdb4d 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/rwmem/rwmem_1.2.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/rwmem/rwmem_1.2.bb @@ -1,4 +1,13 @@ SUMMARY = "A small tool to read/write memory" +DESCRIPTION = "rwmem is a small tool for reading and writing device registers. \ +rwmem supports two modes: mmap mode and i2c mode. \ +\ +In mmap mode rwmem accesses a file by memory mapping it. \ +Using /dev/mem as the memory mapped file makes rwmem access memory and \ +can thus be used to access devices which have memory mapped registers. \ +\ +In i2c mode rwmem accesses an i2c peripheral by sending i2c messages to it." + LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch new file mode 100644 index 000000000..4bd40606b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch @@ -0,0 +1,31 @@ +From 3f2fc79385398f213a9bd3c99616d749d699f2bb Mon Sep 17 00:00:00 2001 +From: Fabio Berton <fabio.berton@ossystems.com.br> +Date: Thu, 14 Mar 2019 19:26:14 -0300 +Subject: [PATCH] Fix build with musl +Organization: O.S. Systems Software LTDA. + +Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> +--- + src/ethtool-local.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/ethtool-local.h b/src/ethtool-local.h +index 200476b..0edc7a9 100644 +--- a/src/ethtool-local.h ++++ b/src/ethtool-local.h +@@ -22,9 +22,9 @@ + */ + + typedef unsigned long long u64; +-typedef __uint32_t u32; +-typedef __uint16_t u16; +-typedef __uint8_t u8; ++typedef uint32_t u32; ++typedef uint16_t u16; ++typedef uint8_t u8; + + #include "ethtool-kernel.h" + +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb new file mode 100644 index 000000000..0b5c5a6ce --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "ifplugd is a Linux daemon which will automatically configure your ethernet device \ +when a cable is plugged in and automatically unconfigure it if the cable is pulled." +HOMEPAGE = "http://0pointer.de/lennart/projects/ifplugd/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "libdaemon" + +SRC_URI = "http://0pointer.de/lennart/projects/ifplugd/ifplugd-${PV}.tar.gz" + +SRC_URI_append_libc-musl = " file://Fix-build-with-musl.patch" + +SRC_URI[md5sum] = "df6f4bab52f46ffd6eb1f5912d4ccee3" +SRC_URI[sha256sum] = "474754ac4ab32d738cbf2a4a3e87ee0a2c71b9048a38bdcd7df1e4f9fd6541f0" + +inherit autotools update-rc.d pkgconfig + +EXTRA_OECONF = "--disable-lynx --with-initdir=${sysconfdir}/init.d" + +INITSCRIPT_NAME = "ifplugd" +INITSCRIPT_PARAMS = "defaults" + +CONFFILES_${PN} = "${sysconfdir}/ifplugd/ifplugd.conf" + +RDEPENDS_${PN} += "bash" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.18.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.20.0.bb index 9f59ad6b4..17d784766 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.18.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.20.0.bb @@ -14,5 +14,5 @@ inherit autotools pkgconfig bash-completion SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ file://clang.patch \ " -SRC_URI[md5sum] = "840cd133bc0f715a7ee4797dd9ac5562" -SRC_URI[sha256sum] = "6cf40128d83d087946a7d8577e735526202e034d52f90047735329609097b282" +SRC_URI[md5sum] = "b5506db07fb2a0b118e0d6e59b3d5b8f" +SRC_URI[sha256sum] = "2cf7c6c7aa9e962a589f61bff2766035b61792ef961131a21fcbbe043f91a866" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb index 36580952f..b985d39ab 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb @@ -16,6 +16,7 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.bz2 \ SRC_URI[md5sum] = "37e9a2d664effe4efd44c0e1a20136de" SRC_URI[sha256sum] = "99906d9560cbdbc97e1855e7b0a7169f1e11983be3ac539140423f09debced82" +COMPATIBLE_HOST_libc-musl = "null" EXTRA_OEMAKE = "" export WVLINK="${LD}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch deleted file mode 100644 index 232db9e63..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 0e054339c1422168a7f4a9dcf090268053a33b1f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 20 Jul 2017 21:05:37 -0700 -Subject: [PATCH 2/5] wvtask: Dont use ucontext on non-glibc systems - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - utils/wvtask.cc | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/utils/wvtask.cc b/utils/wvtask.cc -index cdcd544..c0bff7d 100644 ---- a/utils/wvtask.cc -+++ b/utils/wvtask.cc -@@ -199,7 +199,9 @@ WvTaskMan::WvTaskMan() - stacktop = (char *)alloca(0); - - context_return = 0; -+#ifdef __GLIBC__ - assert(getcontext(&get_stack_return) == 0); -+#endif - if (context_return == 0) - { - // initial setup - start the stackmaster() task (never returns!) -@@ -265,13 +267,17 @@ int WvTaskMan::run(WvTask &task, int val) - state = &old_task->mystate; - - context_return = 0; -+#ifdef __GLIBC__ - assert(getcontext(state) == 0); -+#endif - int newval = context_return; - if (newval == 0) - { - // saved the state, now run the task. - context_return = val; -+#ifdef __GLIBC__ - setcontext(&task.mystate); -+#endif - return -1; - } - else -@@ -319,13 +325,17 @@ int WvTaskMan::yield(int val) - #endif - - context_return = 0; -+#ifdef __GLIBC__ - assert(getcontext(¤t_task->mystate) == 0); -+#endif - int newval = context_return; - if (newval == 0) - { - // saved the task state; now yield to the toplevel. - context_return = val; -+#ifdef __GLIBC__ - setcontext(&toplevel); -+#endif - return -1; - } - else -@@ -341,7 +351,9 @@ int WvTaskMan::yield(int val) - void WvTaskMan::get_stack(WvTask &task, size_t size) - { - context_return = 0; -+#ifdef __GLIBC__ - assert(getcontext(&get_stack_return) == 0); -+#endif - if (context_return == 0) - { - assert(magic_number == -WVTASK_MAGIC); -@@ -371,7 +383,9 @@ void WvTaskMan::get_stack(WvTask &task, size_t size) - // initial setup - stack_target = &task; - context_return = size/1024 + (size%1024 > 0); -+#ifdef __GLIBC__ - setcontext(&stackmaster_task); -+#endif - } - else - { -@@ -409,7 +423,9 @@ void WvTaskMan::_stackmaster() - assert(magic_number == -WVTASK_MAGIC); - - context_return = 0; -+#ifdef __GLIBC__ - assert(getcontext(&stackmaster_task) == 0); -+#endif - val = context_return; - if (val == 0) - { -@@ -419,7 +435,9 @@ void WvTaskMan::_stackmaster() - // all current stack allocations) and go back to get_stack - // (or the constructor, if that's what called us) - context_return = 1; -+#ifdef __GLIBC__ - setcontext(&get_stack_return); -+#endif - } - else - { -@@ -474,7 +492,9 @@ void WvTaskMan::do_task() - - // back here from longjmp; someone wants stack space. - context_return = 0; -+#ifdef __GLIBC__ - assert(getcontext(&task->mystate) == 0); -+#endif - if (context_return == 0) - { - // done the setjmp; that means the target task now has -@@ -510,7 +530,9 @@ void WvTaskMan::do_task() - } - else - { -+#ifdef __GLIBC__ - assert(getcontext(&task->func_call) == 0); -+#endif - task->func_call.uc_stack.ss_size = task->stacksize; - task->func_call.uc_stack.ss_sp = task->stack; - task->func_call.uc_stack.ss_flags = 0; -@@ -521,9 +543,11 @@ void WvTaskMan::do_task() - (void (*)(void))call_func, 1, task); - - context_return = 0; -+#ifdef __GLIBC__ - assert(getcontext(&task->func_return) == 0); - if (context_return == 0) - setcontext(&task->func_call); -+#endif - } - - // the task's function terminated. --- -2.13.3 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb index b9f62da7b..b220f9c1b 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb @@ -15,7 +15,6 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \ file://gcc-6.patch \ file://argp.patch \ file://0001-Check-for-limits.h-during-configure.patch \ - file://0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch \ file://0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch \ file://0004-wvcrash-Replace-use-of-basename-API.patch \ file://0005-check-for-libexecinfo-during-configure.patch \ @@ -28,6 +27,8 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \ SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c" SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633" +COMPATIBLE_HOST_libc-musl = "null" + inherit autotools-brokensep pkgconfig TARGET_CFLAGS_append = " -fno-tree-dce -fno-optimize-sibling-calls" 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 5bb0beb7a..1f0a7b947 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 @@ -66,11 +66,12 @@ RDEPENDS_packagegroup-meta-oe-connectivity ="\ modemmanager mosh \ paho-mqtt-c phonet-utils rabbitmq-c rfkill rtorrent \ ser2net smstools3 telepathy-glib telepathy-idle thrift \ - usbmuxd wvstreams zabbix zeromq \ + usbmuxd zabbix zeromq \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "obex-data-server", "", d)} \ libmikmod \ - obexftp openobex libnet wvdial \ + obexftp openobex libnet \ " +RDEPENDS_packagegroup-meta-oe-connectivity_append_libc-glibc = " wvstreams wvdial" # dracut needs dracut RDEPENDS_packagegroup-meta-oe-core ="\ diff --git a/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.2.0.bb b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.2.0.bb index b23775708..dbf44d796 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.2.0.bb @@ -14,6 +14,9 @@ SRCREV = "4ed5b00dcc409405a19e6d8c6478f703153430e1" S = "${WORKDIR}/git" +PACKAGECONFIG ?= "" +PACKAGECONFIG[coverage] = "-DWITH_COVERAGE=YES,-DWITH_COVERAGE=NO,," + inherit cmake EXTRA_OECMAKE += "-DCOMPILE_TESTS=NO -DCOMPILE_STUBGEN=NO -DCOMPILE_EXAMPLES=NO \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb b/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb index de9a6eb99..fae80a79e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb @@ -7,13 +7,13 @@ the effort of keeping an up-to-date, out-of-tree, packaging of the \ kconfig infrastructure, ready for use by third-party projects. \ The kconfig-frontends package provides the kconfig parser, as well as all \ the frontends" -HOMEPAGE = "http://ymorin.is-a-geek.org/projects/kconfig-frontends" +HOMEPAGE = "https://gitlab.com/ymorin/kconfig-frontends" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408" SECTION = "devel" DEPENDS += "ncurses flex bison gperf-native bison-native" RDEPENDS_${PN} += "python3 bash" -SRC_URI = "git://ymorin.is-a-geek.org/kconfig-frontends;branch=4.11.x \ +SRC_URI = "git://gitlab.com/ymorin/kconfig-frontends.git;protocol=https;branch=4.11.x \ file://0001-Makefile-ensure-frontends-exits-before-writing-into-.patch \ file://0001-Switch-utils-kconfig-diff-to-use-Python-3.patch" diff --git a/meta-openembedded/meta-oe/recipes-devtools/lua/lua/0001-Allow-building-lua-without-readline-on-Linux.patch b/meta-openembedded/meta-oe/recipes-devtools/lua/lua/0001-Allow-building-lua-without-readline-on-Linux.patch new file mode 100644 index 000000000..e76790086 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/lua/lua/0001-Allow-building-lua-without-readline-on-Linux.patch @@ -0,0 +1,59 @@ +From 601ef636fc4dfb2af3e7fda88d8ea1c1d92affe4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 2 Oct 2019 17:54:15 +0200 +Subject: [PATCH] Allow building lua without readline on Linux + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Makefile | 2 +- + src/Makefile | 3 +++ + src/luaconf.h | 5 +++++ + 3 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 119110d..9f6df45 100644 +--- a/Makefile ++++ b/Makefile +@@ -36,7 +36,7 @@ RM= rm -f + # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= + + # Convenience platforms targets. +-PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris ++PLATS= aix bsd c89 freebsd generic linux linux-no-readline macosx mingw posix solaris + + # What to install. + TO_BIN= lua luac +diff --git a/src/Makefile b/src/Makefile +index 64c78f7..5c0428a 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -109,6 +109,9 @@ generic: $(ALL) + linux: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" + ++linux-no-readline: ++ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX_NO_READLINE" SYSLIBS="-Wl,-E -ldl" ++ + macosx: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" + +diff --git a/src/luaconf.h b/src/luaconf.h +index 9eeeea6..d71ca25 100644 +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -64,6 +64,11 @@ + #define LUA_USE_READLINE /* needs some extra libraries */ + #endif + ++#if defined(LUA_USE_LINUX_NO_READLINE) ++#define LUA_USE_POSIX ++#define LUA_USE_DLOPEN /* needs an extra library: -ldl */ ++#endif ++ + + #if defined(LUA_USE_MACOSX) + #define LUA_USE_POSIX +-- +2.17.1 + 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 265e2519e..ae41e627f 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 @@ -4,9 +4,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=318;endline=352;md5=60aa5cfdbd40086501778d9b6ebf29ee" HOMEPAGE = "http://www.lua.org/" -DEPENDS = "readline" SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \ file://lua.pc.in \ + file://0001-Allow-building-lua-without-readline-on-Linux.patch \ " # if no test suite matches PV release of Lua exactly, download the suite for the closest Lua release. @@ -24,18 +24,21 @@ SRC_URI[tarballtest.sha256sum] = "b80771238271c72565e5a1183292ef31bd7166414cd0d4 inherit pkgconfig binconfig ptest +PACKAGECONFIG ??= "readline" +PACKAGECONFIG[readline] = ",,readline" + UCLIBC_PATCHES += "file://uclibc-pthread.patch" SRC_URI_append_libc-uclibc = "${UCLIBC_PATCHES}" TARGET_CC_ARCH += " -fPIC ${LDFLAGS}" -EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -DLUA_USE_LINUX -fPIC' MYLDFLAGS='${LDFLAGS}'" +EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -fPIC' MYLDFLAGS='${LDFLAGS}'" do_configure_prepend() { sed -i -e s:/usr/local:${prefix}:g src/luaconf.h } do_compile () { - oe_runmake linux + oe_runmake ${@bb.utils.contains('PACKAGECONFIG', 'readline', 'linux', 'linux-no-readline', d)} } do_install () { diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb new file mode 100644 index 000000000..326a4abfb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb @@ -0,0 +1,24 @@ +SUMMARY = "fifo maps for c++" +HOMEPAGE = "https://github.com/nlohmann/fifo_map" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=b67209a1e36b682a8226de19d265b1e0" + +SRC_URI = "git://github.com/nlohmann/fifo_map.git" + +PV = "1.0.0+git${SRCPV}" + +SRCREV = "0dfbf5dacbb15a32c43f912a7e66a54aae39d0f9" + +S = "${WORKDIR}/git" + +# nlohmann-fifo is a header only C++ library, so the main package will be empty. + +RDEPENDS_${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" + +do_install() { + install -d ${D}${includedir} + install -m 0644 ${S}/src/fifo_map.hpp ${D}${includedir} +} diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.9.2.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.0.bb index a007b2a69..928454117 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.0.bb @@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" -SRCREV = "52b2447247f535663ac1c292e088b4b27d2910ef" +SRCREV = "6d4e7fd7966c989e38024a8ea693db83758944f1" -SRC_URI = "git://github.com/google/protobuf.git;branch=3.9.x \ +SRC_URI = "git://github.com/google/protobuf.git;branch=3.10.x \ file://run-ptest \ file://0001-protobuf-fix-configure-error.patch \ file://0001-Makefile.am-include-descriptor.cc-when-building-libp.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.3.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.4.bb index 1fe7dcf21..505c9fccc 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.4.bb @@ -28,7 +28,7 @@ SRC_URI = " \ file://0001-Always-enable-trivial-httpd-for-tests.patch \ file://0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch \ " -SRCREV = "5c1697da78ebf6250a7130b8b9e6cbfbeaa34296" +SRCREV = "9d39e7d91e8497987cad69a3fbed5c5fc91eebdc" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc index 06ab10642..8ced8abe5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc @@ -8,6 +8,6 @@ inherit useradd do_install_prepend() { install -m 700 -d ${D}${sysconfdir}/polkit-1/rules.d - chown polkitd:polkitd ${D}${sysconfdir}/polkit-1/rules.d + chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d } USERADD_PARAM_${PN}_prepend = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Out-of-bounds-issue.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Out-of-bounds-issue.patch new file mode 100644 index 000000000..b494ca687 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Out-of-bounds-issue.patch @@ -0,0 +1,31 @@ +From b0894088b680666035a3418326e13bc99d4fed49 Mon Sep 17 00:00:00 2001 +From: Philippe Duveau <pduveau@users.noreply.github.com> +Date: Tue, 24 Sep 2019 20:45:25 +0200 +Subject: [PATCH] Out of bounds issue + +Add a new sanity check after determining the level len. +--- + contrib/pmdb2diag/pmdb2diag.c | 4 ++++ + 1 file changed, 4 insertions(+) + +Upstream-Status: Backport [https://github.com/rsyslog/rsyslog/commit/b0894088b6] +CVE: CVE-2019-17040 +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> +diff --git a/contrib/pmdb2diag/pmdb2diag.c b/contrib/pmdb2diag/pmdb2diag.c +index 2b5916301..5810eb4df 100644 +--- a/contrib/pmdb2diag/pmdb2diag.c ++++ b/contrib/pmdb2diag/pmdb2diag.c +@@ -134,6 +134,10 @@ CODESTARTparse2 + ABORT_FINALIZE(0); + } + ++ /* let recheck with the real level len */ ++ if(pMsg->iLenRawMsg - (int)pMsg->offAfterPRI < pInst->levelpos+lvl_len) ++ ABORT_FINALIZE(RS_RET_COULD_NOT_PARSE); ++ + DBGPRINTF("db2parse Level %d\n", pMsg->iSeverity); + + end = (char*)pMsg->pszRawMsg + pMsg->iLenRawMsg ; +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-pmaixforwardedfrom-bugfix-potential-misadressing.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-pmaixforwardedfrom-bugfix-potential-misadressing.patch new file mode 100644 index 000000000..0b32766a5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-pmaixforwardedfrom-bugfix-potential-misadressing.patch @@ -0,0 +1,43 @@ +From 10549ba915556c557b22b3dac7e4cb73ad22d3d8 Mon Sep 17 00:00:00 2001 +From: Rainer Gerhards <rgerhards@adiscon.com> +Date: Fri, 27 Sep 2019 13:36:02 +0200 +Subject: [PATCH] pmaixforwardedfrom bugfix: potential misadressing + +--- + contrib/pmaixforwardedfrom/pmaixforwardedfrom.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +Upstream-Status: Backport [https://github.com/rsyslog/rsyslog/pull/3884] +CVE: CVE-2019-17041 +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> + +diff --git a/contrib/pmaixforwardedfrom/pmaixforwardedfrom.c b/contrib/pmaixforwardedfrom/pmaixforwardedfrom.c +index 37157c7d4..ebf12ebbe 100644 +--- a/contrib/pmaixforwardedfrom/pmaixforwardedfrom.c ++++ b/contrib/pmaixforwardedfrom/pmaixforwardedfrom.c +@@ -109,6 +109,10 @@ CODESTARTparse + /* bump the message portion up by skipLen(23 or 5) characters to overwrite the "Message forwarded from + " or "From " with the hostname */ + lenMsg -=skipLen; ++ if(lenMsg < 2) { ++ dbgprintf("not a AIX message forwarded from message has nothing after header\n"); ++ ABORT_FINALIZE(RS_RET_COULD_NOT_PARSE); ++ } + memmove(p2parse, p2parse + skipLen, lenMsg); + *(p2parse + lenMsg) = '\n'; + *(p2parse + lenMsg + 1) = '\0'; +@@ -120,6 +124,11 @@ really an AIX log, but has a similar preamble */ + --lenMsg; + ++p2parse; + } ++ if (lenMsg < 1) { ++ dbgprintf("not a AIX message forwarded from message has nothing after colon " ++ "or no colon at all\n"); ++ ABORT_FINALIZE(RS_RET_COULD_NOT_PARSE); ++ } + if (lenMsg && *p2parse != ':') { + DBGPRINTF("not a AIX message forwarded from mangled log but similar enough that the preamble has " + "been removed\n"); +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb index bbb4b119a..f9e44421d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb @@ -23,6 +23,8 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t file://rsyslog.logrotate \ file://use-pkgconfig-to-check-libgcrypt.patch \ file://run-ptest \ + file://0001-Out-of-bounds-issue.patch \ + file://0001-pmaixforwardedfrom-bugfix-potential-misadressing.patch \ " SRC_URI_append_libc-musl = " \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb index b19f9109d..ffd4099b4 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "OpenJPEG library is an open-source JPEG 2000 codec" HOMEPAGE = "http://www.openjpeg.org" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" DEPENDS = "libpng tiff lcms zlib" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb index c2b345da6..62f00563c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb @@ -1,6 +1,6 @@ SUMMARY = "X screen saver and locker" -LICENSE = "BSD" +LICENSE = "BSD-0-Clause" LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=e141ab5822fb2d43694e1e47b59fc0df" SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch new file mode 100644 index 000000000..23618f18a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch @@ -0,0 +1,24 @@ +Add riscv specific checks to choose correct gregs and context structure definitions + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/sigsegv.c ++++ b/sigsegv.c +@@ -91,7 +91,7 @@ static void signal_segv(int signum, sigi + a2j_error("info.si_errno = %d", info->si_errno); + a2j_error("info.si_code = %d (%s)", info->si_code, si_codes[info->si_code]); + a2j_error("info.si_addr = %p", info->si_addr); +-#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__) ++#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__) && !defined(__riscv) + for(i = 0; i < NGREG; i++) + a2j_error("reg[%02d] = 0x" REGFORMAT, i, + #if defined(__powerpc__) +@@ -102,7 +102,7 @@ static void signal_segv(int signum, sigi + ucontext->uc_mcontext.gregs[i] + #endif + ); +-#endif /* alpha, ia64, kFreeBSD, arm, hppa aarch64 */ ++#endif /* alpha, ia64, kFreeBSD, arm, hppa aarch64 riscv */ + + #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64) + # if defined(SIGSEGV_STACK_IA64) diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb index 7dcaaf682..a0aa41223 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb @@ -13,6 +13,7 @@ SRC_URI = " \ http://download.gna.org/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch \ file://0002-aarch64.patch \ + file://riscv_ucontext.patch \ " SRC_URI[md5sum] = "9cf4edbc3ad2ddeeaf6c8c1791ff3ddd" SRC_URI[sha256sum] = "2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d3582606f55f" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch deleted file mode 100644 index d9a3ab7cc..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Fix-OSX-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -From dd65685c24bb25a800ed42388ed0a1e8792b2ed2 Mon Sep 17 00:00:00 2001 -From: falkTX <falktx@gmail.com> -Date: Sat, 24 Nov 2018 14:29:58 +0100 -Subject: [PATCH] Fix OSX build - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Backport [https://github.com/jackaudio/jack2/commit/d851fada460d42508a6f82b19867f63853062583] ---- - posix/JackNetUnixSocket.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/posix/JackNetUnixSocket.cpp b/posix/JackNetUnixSocket.cpp -index 7a5585ef..a4cb5036 100644 ---- a/posix/JackNetUnixSocket.cpp -+++ b/posix/JackNetUnixSocket.cpp -@@ -169,7 +169,7 @@ namespace Jack - - int JackNetUnixSocket::Bind() - { -- return bind(fSockfd, reinterpret_cast<socket_address_t*>(&fRecvAddr), sizeof(socket_address_t)); -+ return ::bind(fSockfd, reinterpret_cast<socket_address_t*>(&fRecvAddr), sizeof(socket_address_t)); - } - - int JackNetUnixSocket::BindWith(const char* ip) --- -2.20.1 - diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch deleted file mode 100644 index e6021cd70..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 72564b04151b61fa8d954bbb43afc58108ee50ec Mon Sep 17 00:00:00 2001 -From: Thomas Nagy <tnagy@waf.io> -Date: Mon, 12 Mar 2018 20:42:55 +0100 -Subject: [PATCH] Python 3.7 fixes #2126 - -Upstream-Status: Backport -[https://gitlab.com/ita1024/waf/commit/facdc0b173d933073832c768ec1917c553cb369c] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - waflib/Node.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/waflib/Node.py b/waflib/Node.py -index fb3cd273..405a6fec 100644 ---- a/waflib/Node.py -+++ b/waflib/Node.py -@@ -537,8 +537,6 @@ class Node(object): - if maxdepth: - for k in node.ant_iter(accept=accept, maxdepth=maxdepth - 1, pats=npats, dir=dir, src=src, remove=remove): - yield k -- raise StopIteration -- - def ant_glob(self, *k, **kw): - """ - This method is used for finding files across folders. It behaves like ant patterns: diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb index 477af8ced..9f7d5b0b6 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb @@ -14,12 +14,9 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "libsamplerate0 libsndfile1 readline" -SRC_URI = "git://github.com/jackaudio/jack2.git \ - file://0001-Python-3.7-fixes-2126.patch \ - file://0001-Fix-OSX-build.patch \ - " -SRCREV = "c1647819eed6d11f94b21981d9c869629299f357" -PV = "1.9.12" +SRC_URI = "git://github.com/jackaudio/jack2.git" +SRCREV = "37250ff470277f9947fbf3ba738f943053e30525" +PV = "1.9.13" S = "${WORKDIR}/git" inherit waf pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb new file mode 100644 index 000000000..bcb3015f8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb @@ -0,0 +1,65 @@ +SUMMARY = "Multimedia processing server for Linux" +AUTHOR = "Wim Taymans <wtaymans@redhat.com>" +HOMEPAGE = "https://pipewire.org" +SECTION = "multimedia" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ + file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" +DEPENDS = "alsa-lib dbus udev" +SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" +PV = "0.2.7" + +SRC_URI = "git://github.com/PipeWire/pipewire" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig systemd manpages + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + gstreamer \ +" + +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native" + +PACKAGES =+ "\ + ${PN}-spa-plugins \ + ${PN}-alsa \ + ${PN}-config \ + gstreamer1.0-${PN} \ + lib${PN} \ + lib${PN}-modules \ +" + +RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins" + +FILES_${PN} = "\ + ${sysconfdir}/pipewire/pipewire.conf \ + ${bindir}/pipewire* \ + ${systemd_user_unitdir}/* \ +" +FILES_lib${PN} = "\ + ${libdir}/libpipewire-*.so.* \ +" +FILES_lib${PN}-modules = "\ + ${libdir}/pipewire-*/* \ +" +FILES_${PN}-spa-plugins = "\ + ${bindir}/spa-* \ + ${libdir}/spa/* \ +" +FILES_${PN}-alsa = "\ + ${libdir}/alsa-lib/* \ + ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \ +" +FILES_gstreamer1.0-${PN} = "\ + ${libdir}/gstreamer-1.0/* \ +" + +CONFFILES_${PN} = "\ + ${sysconfdir}/pipewire/pipewire.conf \ +" diff --git a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb index 4c1393c94..905f95396 100644 --- a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb @@ -37,4 +37,8 @@ inherit autotools pkgconfig PACKAGECONFIG ??= "libatomic-ops" PACKAGECONFIG[libatomic-ops] = "--with-libatomic-ops=yes,--with-libatomic-ops=no,libatomic-ops" +EXTRA_OECONF += "--enable-cpluscplus" + +CFLAGS_append_libc-musl = " -D_GNU_SOURCE -DNO_GETCONTEXT -DSEARCH_FOR_DATA_START -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/daemonize/daemonize_git.bb b/meta-openembedded/meta-oe/recipes-support/daemonize/daemonize_git.bb index 1e49eefcc..c76632781 100644 --- a/meta-openembedded/meta-oe/recipes-support/daemonize/daemonize_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/daemonize/daemonize_git.bb @@ -1,6 +1,6 @@ SUMMARY = "A tool to run a command as a daemon" HOMEPAGE = "http://software.clapper.org/daemonize/" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=3cf9084faa88bc8554a9139d8d7dd35f" PV = "1.7.8" diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb new file mode 100644 index 000000000..97116ee2d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb @@ -0,0 +1,13 @@ +SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" + +DEPENDS = "zlib expat" + +SRC_URI = "https://exiv2.org/releases/${BPN}-${PV}-Source.tar.gz" +SRC_URI[md5sum] = "56d064517ae5903dd963b84514a121c1" +SRC_URI[sha256sum] = "f125286980fd1bcb28e188c02a93946951c61e10784720be2301b661a65b3081" + +S = "${WORKDIR}/${BPN}-${PV}-Source" + +inherit cmake gettext diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb index c48a98183..fdb82519b 100644 --- a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb @@ -1,6 +1,6 @@ SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools" HOMEPAGE = "https://github.com/gperftools/gperftools" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" DEPENDS += "libunwind" diff --git a/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb b/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb index 5030c78a3..48271f721 100644 --- a/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb @@ -2,7 +2,7 @@ SUMMARY = "C and C++ INI Library" HOMEPAGE = "http://code.google.com/p/inih/" PV = "0.0+gitr${SRCPV}" PKGV = "${GITPKGVTAG}" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=dae28cbf28207425e0d0b3eb835f4bde" PR = "r3" diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb index cc0efccf9..4e57d5b77 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -4,14 +4,15 @@ SECTION = "libs" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" -SRCREV = "6ecff5d46e1b12c2859f0b63a73282940e3402bb" -PV = "0.15+git${SRCPV}" +# v0.18 + a single commit fixing the build +SRCREV = "5090603d01779bb1717fb0c50953330e8770550f" +PV = "0.18+git${SRCPV}" SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https" S = "${WORKDIR}/git" -inherit cmake pythonnative systemd +inherit cmake python3native systemd DEPENDS = " \ flex-native bison-native libaio \ @@ -24,22 +25,21 @@ EXTRA_OECMAKE = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \ " -PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND PYTHON_BINDINGS" +PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND" PACKAGECONFIG[USB_BACKEND] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1,libxml2" PACKAGECONFIG[NETWORK_BACKEND] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" -PACKAGECONFIG[PYTHON_BINDINGS] = ",,python" -PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-python" +PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}" -RDEPENDS_${PN}-python = "${PN} python-ctypes python-stringold" +RDEPENDS_${PN}-${PYTHON_PN} = "${PN} ${PYTHON_PN}-ctypes ${PYTHON_PN}-stringold" FILES_${PN}-iiod = " \ ${sbindir}/iiod \ ${systemd_system_unitdir}/iiod.service \ " FILES_${PN}-tests = "${bindir}" -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" +FILES_${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}" SYSTEMD_PACKAGES = "${PN}-iiod" SYSTEMD_SERVICE_${PN}-iiod = "iiod.service" diff --git a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb index b537ce67d..3685c4aca 100644 --- a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb @@ -1,7 +1,7 @@ SUMMARY = "A Library to Access SMI MIB Information" HOMEPAGE = "https://www.ibr.cs.tu-bs.de/projects/libsmi" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause & TCL" LIC_FILES_CHKSUM = "file://COPYING;md5=3ad3076f9332343a21636cfd351f05b7" SRC_URI = "https://www.ibr.cs.tu-bs.de/projects/${BPN}/download/${BP}.tar.gz \ diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb index fe853cde4..6428958f9 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb @@ -4,7 +4,7 @@ SECTION = "libs" DEPENDS = "zlib" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch index e5ad4eaf2..9f9383ef4 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch @@ -1,6 +1,6 @@ -From 24a2c47fd01dde1710f1fa66f5c30ce7010c5956 Mon Sep 17 00:00:00 2001 +From e213ed33a28704f6f538df41a91b7ce95594a4f8 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 21 Sep 2017 15:28:10 +0800 +Date: Tue, 15 Oct 2019 18:12:54 +0800 Subject: [PATCH] start lvm2-monitor.service after tmp.mount The lvm2-monitor.service reqires the existence of locking_dir @@ -9,18 +9,14 @@ So start lvm2-monitor.service after tmp.mount Upstream-Status: Inappropriate [oe specific] +Rebase to v2_03_05 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - - -Update context for lvm2 2.03.02. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> --- scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in -index 7ec4e4e..3282a95 100644 +index 4bf744a..46766cb 100644 --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in @@ -2,7 +2,7 @@ @@ -29,9 +25,9 @@ index 7ec4e4e..3282a95 100644 Requires=dm-event.socket -After=dm-event.socket dm-event.service lvm2-activation.service +After=dm-event.socket dm-event.service lvm2-activation.service tmp.mount - Before=local-fs-pre.target + Before=local-fs-pre.target shutdown.target DefaultDependencies=no Conflicts=shutdown.target -- -1.8.3.1 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.02.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.05.bb index 32bc13d1b..be558ce1d 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.02.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.05.bb @@ -3,8 +3,6 @@ # generates package libdevmapper require lvm2.inc -SRCREV = "913c28917e62577a2ef67152b2e5159237503dda" - DEPENDS += "autoconf-archive-native" TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index 6c95bfd02..41bf78a3f 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 = "https://sourceware.org/pub/lvm2/LVM2.${PV}.tgz \ +SRC_URI = "git://sourceware.org/git/lvm2.git \ file://lvm.conf \ file://0001-implement-libc-specific-reopen_stream.patch \ file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \ @@ -17,10 +17,8 @@ SRC_URI = "https://sourceware.org/pub/lvm2/LVM2.${PV}.tgz \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ file://0001-configure-Fix-setting-of-CLDFLAGS-default.patch \ " -SRC_URI[md5sum] = "5fc07da5461a3794a751dcfc355827d5" -SRC_URI[sha256sum] = "550ba750239fd75b7e52c9877565cabffef506bbf6d7f6f17b9700dee56c720f" - -S = "${WORKDIR}/LVM2.${PV}" +SRCREV = "60bd9e8406ac28a04aa5e8165149f7a5d4f3265a" +S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig systemd license diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-activation-add-synchronization-point.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-activation-add-synchronization-point.patch new file mode 100644 index 000000000..a864f1e21 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-activation-add-synchronization-point.patch @@ -0,0 +1,82 @@ +From f8466749dd73f5b0ccf4fc86c8a7585c4140b3f9 Mon Sep 17 00:00:00 2001 +From: Zdenek Kabelac <zkabelac@redhat.com> +Date: Fri, 16 Aug 2019 23:49:59 +0200 +Subject: [PATCH 1/3] activation: add synchronization point + +Resuming of 'error' table entry followed with it's dirrect removal +is now troublesame with latest udev as it may skip processing of +udev rules for already 'dropped' device nodes. + +As we cannot 'synchronize' with udev while we know we have devices +in suspended state - rework 'cleanup' so it collects nodes +for removal into pending_delete list and process the list with +synchronization once we are without any suspended nodes. + +Upstream-Status: Backport +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + WHATS_NEW | 9 +++++++++ + lib/activate/dev_manager.c | 20 ++++++++++++-------- + 2 files changed, 21 insertions(+), 8 deletions(-) + +diff --git a/WHATS_NEW b/WHATS_NEW +index 3a58de5f9..0b48e032b 100644 +--- a/WHATS_NEW ++++ b/WHATS_NEW +@@ -1,3 +1,12 @@ ++Version 2.03.06 - ++================================ ++ Synchronize with udev when dropping snapshot. ++ Add missing device synchronization point before removing pvmove node. ++ Correctly set read_ahead for LVs when pvmove is finished. ++ Remove unsupported OPTIONS+="event_timeout" udev rule from 11-dm-lvm.rules. ++ Prevent creating VGs with PVs with different logical block sizes. ++ Fix metadata writes from corrupting with large physical block size. ++ + Version 2.03.05 - 15th June 2019 + ================================ + Fix command definition for pvchange -a. +diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c +index 981f4674a..7101ffa12 100644 +--- a/lib/activate/dev_manager.c ++++ b/lib/activate/dev_manager.c +@@ -3558,13 +3558,6 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root, const + const char *name, *uuid; + struct dm_str_list *dl; + +- /* Deactivate any tracked pending delete nodes */ +- dm_list_iterate_items(dl, &dm->pending_delete) { +- log_debug_activation("Deleting tracked UUID %s.", dl->str); +- if (!dm_tree_deactivate_children(root, dl->str, strlen(dl->str))) +- return_0; +- } +- + while ((child = dm_tree_next_child(&handle, root, 0))) { + if (!(name = dm_tree_node_get_name(child))) + continue; +@@ -3585,10 +3578,21 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root, const + if (non_toplevel_tree_dlid && !strcmp(non_toplevel_tree_dlid, uuid)) + continue; + +- if (!dm_tree_deactivate_children(root, uuid, strlen(uuid))) ++ if (!str_list_add(dm->mem, &dm->pending_delete, uuid)) + return_0; + } + ++ /* Deactivate any tracked pending delete nodes */ ++ if (!dm_list_empty(&dm->pending_delete) && !dm_get_suspended_counter()) { ++ fs_unlock(); ++ dm_tree_set_cookie(root, fs_get_cookie()); ++ dm_list_iterate_items(dl, &dm->pending_delete) { ++ log_debug_activation("Deleting tracked UUID %s.", dl->str); ++ if (!dm_tree_deactivate_children(root, dl->str, strlen(dl->str))) ++ return_0; ++ } ++ } ++ + return 1; + } + +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch new file mode 100644 index 000000000..5a6db4b88 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch @@ -0,0 +1,39 @@ +From e48f8328f9d35f23a24e5b27237e8ebf1dbfa269 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 10 Oct 2019 22:38:00 -0400 +Subject: [PATCH] udev: remove unsupported OPTIONS+="event_timeout" rule + +The OPTIONS+="event_timeout" is Unsupported since systemd/udev version 216, +that is ~5 years ago. + +Since systemd/udev version 243, there's a new message printed if unsupported +OPTIONS value is used: + + Invalid value for OPTIONS key, ignoring: 'event_timeout=180' + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1740666 + +Signed-off-by: Peter Rajnoha <prajnoha@redhat.com> + +Upstream-Status: Backport [https://github.com/lvmteam/lvm2/commit/125f27ac37bc9b93cc96f64052b9681b3d479ee1] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + udev/11-dm-lvm.rules.in | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/udev/11-dm-lvm.rules.in b/udev/11-dm-lvm.rules.in +index 91cb991..7c58994 100644 +--- a/udev/11-dm-lvm.rules.in ++++ b/udev/11-dm-lvm.rules.in +@@ -37,8 +37,6 @@ ENV{DM_SUBSYSTEM_UDEV_FLAG0}!="1", ENV{DM_NOSCAN}=="1", ENV{DM_UDEV_DISABLE_OTHE + + ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end" + +-OPTIONS+="event_timeout=180" +- + # Do not create symlinks for inappropriate subdevices. + ENV{DM_LV_NAME}=="pvmove?*|?*_vorigin", GOTO="lvm_disable" + ENV{DM_LV_LAYER}=="?*", GOTO="lvm_disable" +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0002-activation-extend-handling-of-pending_delete.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0002-activation-extend-handling-of-pending_delete.patch new file mode 100644 index 000000000..e30731593 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0002-activation-extend-handling-of-pending_delete.patch @@ -0,0 +1,124 @@ +From d06ad77b47f4dfd25bc3da88c0621ac073ad8ce5 Mon Sep 17 00:00:00 2001 +From: Zdenek Kabelac <zkabelac@redhat.com> +Date: Fri, 23 Aug 2019 13:08:34 +0200 +Subject: [PATCH 2/3] activation: extend handling of pending_delete + +With previous patch 30a98e4d6710a543692d40d11428ae4baea11b7b we +started to put devices one pending_delete list instead +of directly scheduling their removal. + +However we have operations like 'snapshot merge' where we are +resuming device tree in 2 subsequent activation calls - so +1st such call will still have suspened devices and no chance +to push 'remove' ioctl. + +Since we curently cannot easily solve this by doing just single +activation call (which would be preferred solution) - we introduce +a preservation of pending_delete via command structure and +then restore it on next activation call. + +This way we keep to remove devices later - although it might be +not the best moment - this may need futher tunning. + +Also we don't keep the list of operation in 1 trasaction +(unless we do verify udev symlinks) - this could probably +also make it more correct in terms of which 'remove' can +be combined we already running 'resume'. + +Upstream-Status: Backport +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + lib/activate/dev_manager.c | 24 +++++++++++------------- + lib/commands/toolcontext.c | 8 ++++++++ + lib/commands/toolcontext.h | 1 + + 3 files changed, 20 insertions(+), 13 deletions(-) + +diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c +index 7101ffa12..7a7689291 100644 +--- a/lib/activate/dev_manager.c ++++ b/lib/activate/dev_manager.c +@@ -3591,6 +3591,7 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root, const + if (!dm_tree_deactivate_children(root, dl->str, strlen(dl->str))) + return_0; + } ++ dm_list_init(&dm->pending_delete); + } + + return 1; +@@ -3717,25 +3718,22 @@ out_no_root: + int dev_manager_activate(struct dev_manager *dm, const struct logical_volume *lv, + struct lv_activate_opts *laopts) + { ++ dm_list_splice(&dm->pending_delete, &lv->vg->cmd->pending_delete); ++ + if (!_tree_action(dm, lv, laopts, ACTIVATE)) + return_0; + +- /* +- * When lvm2 resumes a device and shortly after that it removes it, +- * udevd rule will try to blindly call 'dmsetup info' on already removed +- * device leaving the trace inside syslog about failing operation. +- * +- * TODO: It's not completely clear this call here is the best fix. +- * Maybe there can be a better sequence, but ATM we do usually resume +- * error device i.e. on cache deletion and remove it. +- * TODO2: there could be more similar cases! +- */ +- if (!dm_list_empty(&dm->pending_delete)) +- fs_unlock(); +- + if (!_tree_action(dm, lv, laopts, CLEAN)) + return_0; + ++ if (!dm_list_empty(&dm->pending_delete)) { ++ log_debug("Preserving %d device(s) for removal while being suspended.", ++ dm_list_size(&dm->pending_delete)); ++ if (!(str_list_dup(lv->vg->cmd->mem, &lv->vg->cmd->pending_delete, ++ &dm->pending_delete))) ++ return_0; ++ } ++ + return 1; + } + +diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c +index 1e03ea235..0a9355361 100644 +--- a/lib/commands/toolcontext.c ++++ b/lib/commands/toolcontext.c +@@ -1734,6 +1734,8 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, + cmd->current_settings = cmd->default_settings; + + cmd->initialized.config = 1; ++ ++ dm_list_init(&cmd->pending_delete); + out: + if (!cmd->initialized.config) { + destroy_toolcontext(cmd); +@@ -1922,6 +1924,12 @@ int refresh_toolcontext(struct cmd_context *cmd) + + cmd->initialized.config = 1; + ++ if (!dm_list_empty(&cmd->pending_delete)) { ++ log_debug(INTERNAL_ERROR "Unprocessed pending delete for %d devices.", ++ dm_list_size(&cmd->pending_delete)); ++ dm_list_init(&cmd->pending_delete); ++ } ++ + if (cmd->initialized.connections && !init_connections(cmd)) + return_0; + +diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h +index 6e4530c8a..54ddec320 100644 +--- a/lib/commands/toolcontext.h ++++ b/lib/commands/toolcontext.h +@@ -237,6 +237,7 @@ struct cmd_context { + const char *report_list_item_separator; + const char *time_format; + unsigned rand_seed; ++ struct dm_list pending_delete; /* list of LVs for removal */ + }; + + /* +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0003-snapshot-always-activate.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0003-snapshot-always-activate.patch new file mode 100644 index 000000000..953e4ad65 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0003-snapshot-always-activate.patch @@ -0,0 +1,40 @@ +From 9143445478871b47ba28b41f5e88d4c415f8205b Mon Sep 17 00:00:00 2001 +From: Zdenek Kabelac <zkabelac@redhat.com> +Date: Mon, 26 Aug 2019 15:13:55 +0200 +Subject: [PATCH 3/3] snapshot: always activate + +Drop the 'cluster-only' optimization so we do resume ALL device +before we try to wait on cookie before 'removal' operation. + +It's more correct order of operation - alhtough possibly slightly +less efficient - but until we have correct list of operations +'in-progress' we can't do anything better. + +Upstream-Status: Backport +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + lib/metadata/snapshot_manip.c | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c +index 5ccf251c7..65d8dbd13 100644 +--- a/lib/metadata/snapshot_manip.c ++++ b/lib/metadata/snapshot_manip.c +@@ -361,13 +361,7 @@ int vg_remove_snapshot(struct logical_volume *cow) + return 0; + } + +- /* +- * For merged snapshot and clustered VG activate cow LV so +- * the following call to deactivate_lv() can clean-up table +- * entries. For this clustered lock need to be held. +- */ +- if (vg_is_clustered(cow->vg) && +- merging_snapshot && !activate_lv(cow->vg->cmd, cow)) { ++ if (merging_snapshot && !activate_lv(cow->vg->cmd, cow)) { + log_error("Failed to activate %s.", cow->name); + return 0; + } +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb index 9907d4f92..b80f1fd4b 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb @@ -1,10 +1,12 @@ require lvm2.inc -SRCREV = "913c28917e62577a2ef67152b2e5159237503dda" - SRC_URI += " \ file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \ file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ + file://0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch \ + file://0001-activation-add-synchronization-point.patch \ + file://0002-activation-extend-handling-of-pending_delete.patch \ + file://0003-snapshot-always-activate.patch \ " DEPENDS += "autoconf-archive-native" diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch index fd1060892..21b8ec6b0 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch @@ -1,7 +1,7 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From:Benjamin Marzinski <bmarzins@redhat.com> -Date: Wed, 2 Jul 2014 12:49:53 -0500 -Subject: [PATCH] RH: Remove the property blacklist exception builtin +From 0000000000000000000000000000000000000000 Mon Sep 17 +00:00:00 2001 From:Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 2 Jul +2014 12:49:53 -0500 Subject: [PATCH] RH: Remove the property blacklist +exception builtin Multipath set the default property blacklist exceptions to (ID_SCSI_VPD|ID_WWN). This has the effect of blacklisting some internal @@ -15,14 +15,14 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Upsteam-Status: Pending -Update patch to 0.8.0 +Update patch to 0.8.2 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- libmultipath/blacklist.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c -index e0d0279..9f58313 100644 +index 00e8dbd..5204501 100644 --- a/libmultipath/blacklist.c +++ b/libmultipath/blacklist.c @@ -192,12 +192,6 @@ setup_default_blist (struct config * conf) @@ -38,8 +38,8 @@ index e0d0279..9f58313 100644 str = STRDUP("^(td|hd|vd)[a-z]"); if (!str) return 1; -@@ -415,8 +409,11 @@ filter_property(struct config *conf, struct udev_device *udev, int lvl) - } +@@ -437,8 +431,11 @@ filter_property(struct config *conf, struct udev_device *udev, int lvl, + r = MATCH_NOTHING; } - log_filter(devname, NULL, NULL, NULL, env, NULL, r, lvl); diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch index 938262ba4..724bef813 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch @@ -1,7 +1,10 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <bmarzins@redhat.com> -Date: Fri, 17 Oct 2014 11:20:34 -0500 -Subject: [PATCH] RH: add wwids from kernel cmdline mpath.wwids with -A +From 0f54b3120ca06ff3168cdbf901a27b68c4638398 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 26 Sep 2019 16:29:48 +0800 +Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 + 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Fri, 17 + Oct 2014 11:20:34 -0500 Subject: [PATCH] RH: add wwids from kernel cmdline + mpath.wwids with -A This patch adds another option to multipath, "-A", which reads /proc/cmdline for mpath.wwid=<WWID> options, and adds any wwids it finds @@ -16,7 +19,7 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Upstream-Status: Pending -Update this patch to new version 0.8.0 +Update this patch to new version 0.8.2 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- @@ -28,10 +31,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> 5 files changed, 57 insertions(+), 1 deletion(-) diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c -index 53e7951..9ba9b62 100644 +index ef74812..19c4d68 100644 --- a/libmultipath/wwids.c +++ b/libmultipath/wwids.c -@@ -443,3 +443,47 @@ int op ## _wwid(const char *wwid) \ +@@ -444,3 +444,47 @@ int op ## _wwid(const char *wwid) \ declare_failed_wwid_op(is_failed, false) declare_failed_wwid_op(mark_failed, true) declare_failed_wwid_op(unmark_failed, true) @@ -92,27 +95,27 @@ index 0c6ee54..e32a0b0 100644 enum { WWID_IS_NOT_FAILED = 0, diff --git a/multipath/main.c b/multipath/main.c -index 5abb118..c751b31 100644 +index 96a1146..5fc65ef 100644 --- a/multipath/main.c +++ b/multipath/main.c -@@ -134,6 +134,7 @@ usage (char * progname) - fprintf (stderr, VERSION_STRING); - fprintf (stderr, "Usage:\n"); - fprintf (stderr, " %s [-a|-c|-w|-W] [-d] [-r] [-i] [-v lvl] [-p pol] [-b fil] [-q] [dev]\n", progname); -+ fprintf (stderr, " %s [-a|-A|-c|-w|-W] [-d] [-r] [-i] [-v lvl] [-p pol] [-b fil] [-q] [dev]\n", progname); - fprintf (stderr, " %s -l|-ll|-f [-v lvl] [-b fil] [-R num] [dev]\n", progname); - fprintf (stderr, " %s -F [-v lvl] [-R num]\n", progname); - fprintf (stderr, " %s [-t|-T]\n", progname); -@@ -147,6 +148,8 @@ usage (char * progname) +@@ -139,6 +139,7 @@ usage (char * progname) + fprintf (stderr, " %s [-v level] [-l|-ll] [device]\n", progname); + fprintf (stderr, " %s [-v level] [-a|-w] device\n", progname); + fprintf (stderr, " %s [-v level] -W\n", progname); ++ fprintf (stderr, " %s [-v level] -A\n", progname); + fprintf (stderr, " %s [-v level] [-i] [-c|-C] device\n", progname); + fprintf (stderr, " %s [-v level] [-i] [-u|-U]\n", progname); + fprintf (stderr, " %s [-h|-t|-T]\n", progname); +@@ -151,6 +152,8 @@ usage (char * progname) " -f flush a multipath device map\n" " -F flush all multipath device maps\n" " -a add a device wwid to the wwids file\n" -+ " -A add devices from kernel command line mpath.wwids\n" -+ " parameters to wwids file\n" ++ " -A add devices from kernel command line mpath.wwids\n" ++ " parameters to wwids file\n" " -c check if a device should be a path in a multipath device\n" " -C check if a multipath device has usable paths\n" " -q allow queue_if_no_path when multipathd is not running\n" -@@ -870,7 +873,7 @@ main (int argc, char *argv[]) +@@ -905,7 +908,7 @@ main (int argc, char *argv[]) exit(RTVL_FAIL); multipath_conf = conf; conf->retrigger_tries = 0; @@ -121,17 +124,17 @@ index 5abb118..c751b31 100644 switch(arg) { case 1: printf("optarg : %s\n",optarg); break; -@@ -937,6 +940,10 @@ main (int argc, char *argv[]) - case 't': - r = dump_config(conf, NULL, NULL) ? RTVL_FAIL : RTVL_OK; - goto out_free_config; +@@ -998,6 +1001,10 @@ main (int argc, char *argv[]) + case 'R': + retries = atoi(optarg); + break; + case 'A': + if (remember_cmdline_wwid() != 0) + exit(1); + exit(0); - case 'T': - cmd = CMD_DUMP_CONFIG; - break; + case ':': + fprintf(stderr, "Missing option argument\n"); + usage(argv[0]); diff --git a/multipath/multipath.8 b/multipath/multipath.8 index 9cdd05a..1e120f3 100644 --- a/multipath/multipath.8 diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch index 95624ad7a..c59edbbb2 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch @@ -1,10 +1,7 @@ -From 56d65ecb1c6d814929f6ff3159ade09dc203cc83 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Mon, 26 Nov 2018 10:31:30 +0800 -Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 - 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Mon, 6 Nov - 2017 21:39:28 -0600 Subject: [PATCH] RH: warn on invalid regex instead of - failing +From 0000000000000000000000000000000000000000 Mon Sep 17 +00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Mon, 6 Nov +2017 21:39:28 -0600 Subject: [PATCH] RH: warn on invalid regex instead of +failing multipath.conf used to allow "*" as a match everything regular expression, instead of requiring ".*". Instead of erroring when the old style @@ -15,10 +12,9 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Upstream-Status: Pending -update this patch to new version +update this patch to 0.8.2 Signed-off-by: Changqing Li <changqing.li@windriver.com> - --- libmultipath/dict.c | 29 ++++++++++++++++++++++------- libmultipath/parser.c | 13 +++++++++++++ @@ -26,7 +22,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/libmultipath/dict.c b/libmultipath/dict.c -index eaad4f1..fb30577 100644 +index c6eba0f..05ed3d8 100644 --- a/libmultipath/dict.c +++ b/libmultipath/dict.c @@ -59,6 +59,21 @@ set_str(vector strvec, void *ptr) @@ -51,7 +47,7 @@ index eaad4f1..fb30577 100644 set_yes_no(vector strvec, void *ptr) { char * buff; -@@ -1373,8 +1388,8 @@ ble_ ## option ## _handler (struct config *conf, vector strvec) \ +@@ -1415,8 +1430,8 @@ ble_ ## option ## _handler (struct config *conf, vector strvec) \ \ if (!conf->option) \ return 1; \ @@ -62,7 +58,7 @@ index eaad4f1..fb30577 100644 if (!buff) \ return 1; \ \ -@@ -1390,7 +1405,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec) \ +@@ -1432,7 +1447,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec) \ if (!conf->option) \ return 1; \ \ @@ -71,7 +67,7 @@ index eaad4f1..fb30577 100644 if (!buff) \ return 1; \ \ -@@ -1493,16 +1508,16 @@ device_handler(struct config *conf, vector strvec) +@@ -1535,16 +1550,16 @@ device_handler(struct config *conf, vector strvec) return 0; } @@ -93,11 +89,11 @@ index eaad4f1..fb30577 100644 declare_hw_handler(hwhandler, set_str) diff --git a/libmultipath/parser.c b/libmultipath/parser.c -index 92ef7cf..0e2cf49 100644 +index e00c5ff..6ca5842 100644 --- a/libmultipath/parser.c +++ b/libmultipath/parser.c -@@ -384,6 +384,19 @@ set_value(vector strvec) - return alloc; +@@ -382,6 +382,19 @@ oom: + return NULL; } +void * @@ -128,3 +124,6 @@ index 62906e9..b791705 100644 extern int process_file(struct config *conf, char *conf_file); extern struct keyword * find_keyword(vector keywords, vector v, char * name); int snprint_keyword(char *buff, int len, char *fmt, struct keyword *kw, +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.1.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.2.bb index 8d86e606c..06e78c78c 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.2.bb @@ -47,7 +47,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" -SRCREV = "e23b5d7cf67a9c543e118f2f6b902594a02a804a" +SRCREV = "8a7e9b6648898f2c2d2bbd2d22871f79612e716e" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/onig/onig_5.9.6.bb b/meta-openembedded/meta-oe/recipes-support/onig/onig_5.9.6.bb index abbaf98c0..20a71c6c9 100644 --- a/meta-openembedded/meta-oe/recipes-support/onig/onig_5.9.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/onig/onig_5.9.6.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Regular expressions library. The characteristics of this \ library is that different character encoding for every regular expression \ object can be specified." HOMEPAGE = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=0d4861b5bc0c392a5aa90d9d76ebd86f" SRC_URI = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/archive/${BP}.tar.gz \ diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.24.0.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb index 7632fd2de..1d739874b 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.24.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb @@ -5,14 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "pidgin gmime intltool-native glib-2.0-native" -inherit pkgconfig -inherit autotools +inherit autotools gettext pkgconfig SRC_URI = "${SOURCEFORGE_MIRROR}/sipe/pidgin-sipe-${PV}.tar.xz \ " -SRC_URI[md5sum] = "b91106d28c235b347a63dcb676f7b66a" -SRC_URI[sha256sum] = "958803722b23d869131f76bd90df9da19116d4ca5a873e5253371479b7390f43" +SRC_URI[md5sum] = "0e742f021dc8c3f17435aea05c3e0314" +SRC_URI[sha256sum] = "738b121b11f2b3f1744150c00cb381222eb6cf67161a7742797eb4f03e64a2ba" PACKAGECONFIG ??= "nss krb5" PACKAGECONFIG[nss] = "--enable-nss=yes,--enable-nss=no,nss" diff --git a/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.10.bb b/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.10.bb index 35e22d3ea..c09b495be 100644 --- a/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.10.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The sdparm utility accesses and optionally modifies \ SCSI devices' mode page and inquiry data." HOMEPAGE = "http://sg.danny.cz/sg/sdparm.html" SECTION = "console/utils" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=ecab6c36b7ba82c675581dd0afde36f7 \ file://lib/BSD_LICENSE;md5=1d52f4a66f1e0ed96776bf354ab7a2ed" DEPENDS="sg3-utils" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto.inc index e85ce9a91..b18dbaf33 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto.inc @@ -2,12 +2,12 @@ DESCRIPTION = "A fast, pure Python library for parsing and serializing ASN.1 str HOMEPAGE = "https://github.com/wbond/asn1crypto" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=52010cd3c7d7bd965b55721ef4d93ec2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7439e38f5e04ff62fae436184786b7ca" PYPI_PACKAGE = "asn1crypto" -SRC_URI[md5sum] = "de3520426e81a6581352d4366f310eb1" -SRC_URI[sha256sum] = "9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49" +SRC_URI[md5sum] = "cf33950b47b5148e29f1d62a6b6c009b" +SRC_URI[sha256sum] = "0b199f211ae690df3db4fd6c1c4ff976497fb1da689193e368eedbadc53d9292" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto_0.24.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto_1.0.1.bb index 46aace286..46aace286 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto_0.24.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto_1.0.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-attrs.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-attrs.inc index bd0f7ee2c..13c9e5f25 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-attrs.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-attrs.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://www.attrs.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d4ab25949a73fe7d4fdee93bcbdbf8ff" -SRC_URI[sha256sum] = "f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399" -SRC_URI[md5sum] = "2be7bce157988928f5ff2bb50a0b510d" +SRC_URI[sha256sum] = "f913492e1663d3c36f502e5e9ba6cd13cf19d7fab50aa13239e420fef95e1396" +SRC_URI[md5sum] = "d5a6ee80beaa072bd2b3bcb6fee0d508" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-attrs_19.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-attrs_19.2.0.bb index e3bec0fdf..e3bec0fdf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-attrs_19.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-attrs_19.2.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-beautifulsoup4.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-beautifulsoup4.inc index a7fa081e4..acf52dd7d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-beautifulsoup4.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-beautifulsoup4.inc @@ -3,8 +3,8 @@ HOMEPAGE = " https://www.crummy.com/software/BeautifulSoup/bs4" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=f2d38d8a40bf73fd4b3d16ca2e5882d1" -SRC_URI[md5sum] = "2b34208b26b5c49d4c84a4b9cf78656a" -SRC_URI[sha256sum] = "25288c9e176f354bf277c0a10aa96c782a6a18a17122dba2e8cec4a97e03343b" +SRC_URI[md5sum] = "be03d778cf61cf6734a480e2010d6657" +SRC_URI[sha256sum] = "6135db2ba678168c07950f9a16c4031822c6f4aec75a65e0a97bc5ca09789931" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-beautifulsoup4_4.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-beautifulsoup4_4.8.1.bb index 907285ac1..907285ac1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-beautifulsoup4_4.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-beautifulsoup4_4.8.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cffi.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-cffi.inc index 818d23815..07baa2daf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cffi.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cffi.inc @@ -4,8 +4,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" DEPENDS += "libffi ${PYTHON_PN}-pycparser" -SRC_URI[md5sum] = "35ad1f9e1003cac9404c1493eb10d7f5" -SRC_URI[sha256sum] = "041c81822e9f84b1d9c401182e174996f0bae9991f33725d059b771744290774" +SRC_URI[md5sum] = "2c90be6d3bfbf80ab732b28fd677051d" +SRC_URI[sha256sum] = "8fe230f612c18af1df6f348d02d682fe2c28ca0a6c3856c99599cdacae7cf226" RDEPENDS_${PN}_class-target = " \ ${PYTHON_PN}-ctypes \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.12.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.13.0.bb index bc667b805..bc667b805 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.12.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.13.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2.inc index 3afa93adb..7782b1447 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://packages.python.org/cmd2/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=01aeabea7ae1529a8e4b674b7107d6bc" -SRC_URI[md5sum] = "c030c7364422609d16028fe1ea023bfe" -SRC_URI[sha256sum] = "77bea602eb3b553a573188fa9514234bb1e44269d830a0ef8c4357f47aa9e46a" +SRC_URI[md5sum] = "f7a51dc68ad377ebc6a84408044dc1a2" +SRC_URI[sha256sum] = "840cdbf50e83761fea69ca5beadcba7569ab03734e3ee42b0dbf7f6f90e1213d" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.18.bb index 17b6ae285..17b6ae285 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.17.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.18.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-jinja2.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-jinja2.inc index aee7bd3ff..6a6aad9ef 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-jinja2.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-jinja2.inc @@ -1,11 +1,11 @@ DESCRIPTION = "Python Jinja2: A small but fast and easy to use stand-alone template engine written in pure python." LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=20c831f91dd3bd486020f672ba2be386" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" PYPI_PACKAGE = "Jinja2" -SRC_URI[md5sum] = "0ae535be40fd215a8114a090c8b68e5a" -SRC_URI[sha256sum] = "065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013" +SRC_URI[md5sum] = "7883559bc5cc3e2781d94b4be61cfdcd" +SRC_URI[sha256sum] = "9fe95f19286cfefaa917656583d020be14e7859c6b0252588391e47db34527de" RDEPENDS_${PN} += "${PYTHON_PN}-io ${PYTHON_PN}-pickle ${PYTHON_PN}-crypt \ ${PYTHON_PN}-math ${PYTHON_PN}-netclient \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-jinja2_2.10.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-jinja2_2.10.3.bb index 5233cf40c..5233cf40c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-jinja2_2.10.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-jinja2_2.10.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc index c772e9eb5..d9ccf1cad 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc @@ -2,8 +2,8 @@ SUMMARY = "An implementation of JSON Schema validation for Python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8" -SRC_URI[md5sum] = "2b44d00dccc96d7ba3839190263152eb" -SRC_URI[sha256sum] = "8d4a2b7b6c2237e0199c8ea1a6d3e05bf118e289ae2b9d7ba444182a2959560d" +SRC_URI[md5sum] = "a802ab85600074a726ef6acc4e6a8148" +SRC_URI[sha256sum] = "2fa0684276b6333ff3c0b1b27081f4b2305f0a36cf702a23db50edb141893c3f" DEPENDS += "${PYTHON_PN}-vcversioner-native ${PYTHON_PN}-setuptools-scm-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_3.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_3.1.1.bb index b677c646e..b677c646e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_3.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_3.1.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.2.2.bb index 6c78598a4..2778fc6b5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.2.2.bb @@ -5,8 +5,8 @@ RDEPENDS_${PN} = "python-six" LIC_FILES_CHKSUM = "file://docs/license.txt;md5=1798f29d55080c60365e6283cb49779c" -SRC_URI[md5sum] = "4ec8ac6032270daf91ff9621bda019d0" -SRC_URI[sha256sum] = "3d9c9e96a8408777b01976dfce900049e9e8c970e02198534f2c8c1b2cca5dee" +SRC_URI[md5sum] = "788fceb192bc338f1a3e2a8f78fd42b6" +SRC_URI[sha256sum] = "0b1f4d86f8366f0d4093e5449813792c98e760edc6b7c918f0f29f9ef22ae996" PYPI_PACKAGE = "Paste" inherit pypi setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.3.bb index 506a9e21c..2b5ee9e7e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.2.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pip_19.3.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://pip.pypa.io/" LICENSE = "MIT & LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" -SRC_URI[md5sum] = "f417444c66a0db1a82c8d9d2283a2f95" -SRC_URI[sha256sum] = "e7a31f147974362e6c82d84b91c7f2bdf57e4d3163d3d454e6c3e71944d67135" +SRC_URI[md5sum] = "a57da8b758cbf1a155cde6a7a4428ba7" +SRC_URI[sha256sum] = "324d234b8f6124846b4e390df255cacbe09ce22791c3b714aa1ea6e44a4f2861" inherit pypi setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules.inc index a9e4bbef0..fcb140ac3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules.inc @@ -6,8 +6,8 @@ HOMEPAGE = "https://github.com/etingof/pyasn1-modules" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a14482d15c2249de3b6f0e8a47e021fd" -SRC_URI[md5sum] = "c0bbe9820c971a97f156ff343ae67911" -SRC_URI[sha256sum] = "43c17a83c155229839cc5c6b868e8d0c6041dba149789b6d6e28801c64821722" +SRC_URI[md5sum] = "18c77d56abeef631d94f95ff2d652859" +SRC_URI[sha256sum] = "0c35a52e00b672f832e5846826f1fb7507907f7d52fba6faa9e3c4cbe874fe4b" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules_0.2.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules_0.2.7.bb index eb7888408..eb7888408 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules_0.2.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules_0.2.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc index 576361c41..fa264f791 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://pytest.org" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=640061b8cee64b308a4d2f9f556c12f2" -SRC_URI[md5sum] = "79efe2708aa73dd5c618e5a89d80ce58" -SRC_URI[sha256sum] = "cc6620b96bc667a0c8d4fa592a8c9c94178a1bd6cc799dbb057dfd9286d31a31" +SRC_URI[md5sum] = "00561d0295aab167987f8a4f784964c4" +SRC_URI[sha256sum] = "ca563435f4941d0cb34767301c27bc65c510cb82e90b9ecf9cb52dc2c63caaa0" SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.2.1.bb index 39e50aca9..39e50aca9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.2.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytz.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytz.inc index ddeedc6c8..b4edea002 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytz.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytz.inc @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4878a915709225bceab739bdc2a18e8d" inherit pypi -SRC_URI[md5sum] = "8c21963449c3a793aa61ef122e171516" -SRC_URI[sha256sum] = "26c0b32e437e54a18161324a2fca3c4b9846b74a8dccddd843113109e1116b32" +SRC_URI[md5sum] = "c3d84a465fc56a4edd52cca8873ac0df" +SRC_URI[sha256sum] = "b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be" RDEPENDS_${PN}_class-target += "\ ${PYTHON_PN}-datetime \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytz_2019.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytz_2019.3.bb index f2ffc596f..f2ffc596f 100755 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytz_2019.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytz_2019.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-waitress.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-waitress.inc new file mode 100644 index 000000000..732c31dbd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-waitress.inc @@ -0,0 +1,10 @@ +SUMMARY = "A WSGI server for Python" +DESCRIPTION = "Waitress is meant to be a production-quality pure-Python WSGI \ + server with very acceptable performance." +HOMEPAGE = "https://github.com/Pylons/waitress" +SECTION = "devel/python" +LICENSE = "ZPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=78ccb3640dc841e1baecb3e27a6966b2" + +SRC_URI[md5sum] = "d9132d313de0c5e0fec34ef9ede5442e" +SRC_URI[sha256sum] = "278e09d6849acc1365404bbf7d790d0423b159802e850c726e8cd0a126a2dac7" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-waitress_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-waitress_1.3.1.bb new file mode 100644 index 000000000..26a628ea0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-waitress_1.3.1.bb @@ -0,0 +1,2 @@ +inherit setuptools pypi +require python-waitress.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-xxhash.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-xxhash.inc index 6b4448220..93b2a15a7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-xxhash.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-xxhash.inc @@ -3,5 +3,5 @@ SECTION = "devel/python" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=5a8d76283514a1b7e6a414aba38629b5" -SRC_URI[md5sum] = "2e6c0bd69a540e15ff2222d6cb8da466" -SRC_URI[sha256sum] = "6b5af8c37ff12745ae77f28e695c0d3a3327932fd229824e49382377e940fdf1" +SRC_URI[md5sum] = "80461eff10ac62214fa788a6045aab43" +SRC_URI[sha256sum] = "82cdc67b41da904aa2921107e9877814079d9b067a99f19852b5d85e8a40555d" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_0.24.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_1.0.1.bb index cfbe57520..cfbe57520 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_0.24.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_1.0.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_19.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_19.2.0.bb index c34693f50..c34693f50 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_19.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_19.2.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.8.1.bb index d98df11e3..d98df11e3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.8.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.12.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.13.0.bb index e88808434..e88808434 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.12.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.13.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.18.bb index f5c5c7e1a..f5c5c7e1a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.17.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.18.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.7.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.7.11.bb new file mode 100644 index 000000000..25e3b9c3f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.7.11.bb @@ -0,0 +1,9 @@ +SUMMARY = "The Google API Client for Python is a client library for accessing the Plus, Moderator, and many other Google APIs." +HOMEPAGE = "https://github.com/googleapis/google-api-python-client" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3" + +SRC_URI[md5sum] = "6e28e8caf2e4d55ed5b7c48a538a61c9" +SRC_URI[sha256sum] = "a8a88174f66d92aed7ebbd73744c2c319b4b1ce828e565f9ec721352d2e2fb8c" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.10.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.10.3.bb index 284f5f588..284f5f588 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.10.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.10.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_3.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_3.1.1.bb index 926990747..926990747 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_3.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_3.1.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-monotonic_1.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-monotonic_1.5.bb new file mode 100644 index 000000000..94b90524b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-monotonic_1.5.bb @@ -0,0 +1,9 @@ +SUMMARY = "This module provides a monotonic() function which returns the value (in fractional seconds) of a clock which never goes backwards." +HOMEPAGE = "https://github.com/atdt/monotonic" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" + +SRC_URI[md5sum] = "9f81cb0e5966479754453dea2b6822f4" +SRC_URI[sha256sum] = "23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-msk_0.3.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-msk_0.3.13.bb new file mode 100644 index 000000000..3f2aaf48d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-msk_0.3.13.bb @@ -0,0 +1,11 @@ +SUMMARY = "A tool to help with creating, uploading, and upgrading Mycroft skills on the skills repo." +HOMEPAGE = "https://github.com/MycroftAI/mycroft-skills-kit" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.md;md5=2f90e43663eddf1c33087419fbb35e28" + +SRC_URI[md5sum] = "11d9fc865ef627efe68f25fc113974e8" +SRC_URI[sha256sum] = "55be86ff2cd0087016759f2b15b40861cda2a8d8a8d0c669fdacdf32a77a10da" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "python3-git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.7.bb index 3b1186f06..3b1186f06 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.2.1.bb index eba6632a2..eba6632a2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.2.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2019.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2019.3.bb index 19a89dc55..19a89dc55 100755 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2019.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2019.3.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_1.3.1.bb new file mode 100644 index 000000000..83c8b66d8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_1.3.1.bb @@ -0,0 +1,2 @@ +inherit setuptools3 pypi +require python-waitress.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.2.bb index 76bc41a11..76bc41a11 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.2.bb diff --git a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.9.bb b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.10.bb index eec525b88..602368b3a 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.9.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.10.bb @@ -9,8 +9,8 @@ DEPENDS += "python3-distutils-extra-native" B = "${S}" -SRC_URI[md5sum] = "829824fba33e86d03345bbc718e7b2d9" -SRC_URI[sha256sum] = "29a39b85804336e4819dceff203693a5904b7e11d7e024b49b5aab2649ed944e" +SRC_URI[md5sum] = "1b8e7bfd955364b7912fb0a248329b3a" +SRC_URI[sha256sum] = "2573a004105031f871c92fed22a0c4b15bb96f2dff6e36c4f2959f56b62e343d" FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb b/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.1.bb index 1e9e5f1a1..8196e6c17 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.1.bb @@ -14,8 +14,8 @@ inherit distutils3 gtk-icon-cache distro_features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "https://launchpad.net/menulibre/2.2/${PV}/+download/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "9690848dbf9196c3f7baa574e90378d8" -SRC_URI[sha256sum] = "546fec87f451c8f5c220d02b1f36dd850f4ce9ab607f8e9711ed8f2009e349fe" +SRC_URI[md5sum] = "8460ea844a5998c5f722bccb5ce8627a" +SRC_URI[sha256sum] = "5b3ef8e6073d584f6accf282fa1eb649185ee42eb22fab70231491c7377d7e8f" do_compile() { } diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb b/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb index ff954acb8..9d031dd59 100644 --- a/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb +++ b/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb @@ -1,7 +1,7 @@ SUMMARY = "Simple client plugin for Music Player Daemon" HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin" SECTION = "x11/application" -LICENSE = "BSD" +LICENSE = "BSD-0-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=3604d987e6dfdfc672c754d08953b0e0" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb index 04da55d61..6a72c89a6 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb @@ -1,6 +1,6 @@ SUMMARY = "Panel plugin displaying instant disk/partition performance" HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb index 6ffa35aad..95c1fe4d9 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Panel plugin displaying stats from a wireless lan interface" HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e1e5872df9c5cf1a23f16493d9104920" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-use-lxdm-to-replace-dm-tool.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch index b06e26e91..b06e26e91 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-use-lxdm-to-replace-dm-tool.patch +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.1.bb index 749c3fea4..a1b571e68 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.1.bb @@ -8,11 +8,11 @@ inherit xfce gtk-doc gobject-introspection distro_features_check remove-libtool REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "940e8b430e28093a2e56e390055bcd51" -SRC_URI[sha256sum] = "d5f8f3bd7e142139987e5e62cda26135a424baabb5e47aa0c23b4169d0a66ef4" +SRC_URI[md5sum] = "3323588f1c18f04891e013243da1e355" +SRC_URI[sha256sum] = "9c3c78b49ddfac7d42a804e6a6ad9d22ad64ec60bbe17d8724bc52d3e3f6d114" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ - file://0001-use-lxdm-to-replace-dm-tool.patch \ + file://0002-use-lxdm-to-replace-dm-tool.patch \ " python populate_packages_prepend() { diff --git a/meta-openpower/recipes-bsp/pdbg/pdbg_2.3.bb b/meta-openpower/recipes-bsp/pdbg/pdbg_2.4.bb index faca30fde..e1651ca5c 100644 --- a/meta-openpower/recipes-bsp/pdbg/pdbg_2.3.bb +++ b/meta-openpower/recipes-bsp/pdbg/pdbg_2.4.bb @@ -3,10 +3,10 @@ DESCRIPTION = "pdbg allows JTAG-like debugging of the host POWER processors" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" -PV = "2.3+git${SRCPV}" +PV = "2.4+git${SRCPV}" SRC_URI += "git://github.com/open-power/pdbg.git" -SRCREV = "8a10a05c89db666bf98734139334166da7c370a4" +SRCREV = "8b4611b5d8e7e2279fe4aa80c892fcfe10aa398d" DEPENDS += "dtc-native" diff --git a/meta-openpower/recipes-phosphor/flash/host-fw_git.bb b/meta-openpower/recipes-phosphor/flash/host-fw_git.bb new file mode 100644 index 000000000..00fc1fd59 --- /dev/null +++ b/meta-openpower/recipes-phosphor/flash/host-fw_git.bb @@ -0,0 +1,33 @@ +SUMMARY = "OpenPOWER Host Firmware Image" +DESCRIPTION = "Adds the OpenPOWER Host Firmware image to the BMC image" +PR = "r1" + +inherit allarch + +HOST_FW_LICENSE ?= "Apache-2.0" +HOST_FW_LIC_FILES_CHKSUM ?= "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +HOST_FW_SRC_URI ?= "" + +LICENSE = "${HOST_FW_LICENSE}" +LIC_FILES_CHKSUM = "${HOST_FW_LIC_FILES_CHKSUM}" +SRC_URI = "${HOST_FW_SRC_URI}" + +DEPENDS = "squashfs-tools-native" + +S = "${WORKDIR}" +B = "${WORKDIR}/build" +do_compile[cleandirs] = "${B}" + +do_compile() { + if [ -n "${HOST_FW_SRC_URI}" ]; then + unsquashfs -d ${B}/squashfs-root ${S}/pnor.xz.squashfs + fi +} + +do_install() { + install -d ${D}${datadir}/${BPN} + + if [ -n "${HOST_FW_SRC_URI}" ]; then + install -m 0440 ${B}/squashfs-root/* ${D}${datadir}/${BPN} + fi +} diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index a59bcac19..093a7adcf 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -39,7 +39,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "b41a57d52c6e5f6673b784a7a94a8dec0787770b" +SRCREV = "85f25407598494d8f91890df5152501680a067dd" DBUS_SERVICE_${PN} += "org.open_power.Software.Host.Updater.service" diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 33ac60c6c..a72adb66e 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit autotools obmc-phosphor-utils pkgconfig pythonnative inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "60db8b147dad15890ffed21230537cd8d4898efc" +SRCREV = "22a057ed88f0f68aca521cf8e239413113b31932" DEPENDS += " \ autoconf-archive-native \ diff --git a/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.service b/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.service index e58a04629..22bb80c10 100644 --- a/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.service +++ b/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.service @@ -1,5 +1,6 @@ [Unit] Description=Init BMC Hostname +ConditionPathExists=!/var/lib/first-boot-set-hostname Wants=op-vpd-parser.service After=op-vpd-parser.service diff --git a/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh b/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh index 62284d16b..eaabb0a17 100644 --- a/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh +++ b/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh @@ -81,4 +81,5 @@ sync_hostname() { sync_hostname -systemctl --no-reload disable first-boot-set-hostname.service +# Prevent start at next boot time +touch "/var/lib/first-boot-set-hostname" diff --git a/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh b/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh index da1b305d4..63a4ad710 100755 --- a/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh +++ b/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh @@ -79,4 +79,6 @@ fi sync_mac $1 -systemctl --no-reload disable first-boot-set-mac@${1}.service +# Prevent start at next boot time +mkdir -p "/var/lib/first-boot-set-mac" +touch "/var/lib/first-boot-set-mac/${1}" diff --git a/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac@.service b/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac@.service index 8986efd46..3ff5fc180 100644 --- a/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac@.service +++ b/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac@.service @@ -1,5 +1,6 @@ [Unit] Description=Init BMC MAC address for NIC %I +ConditionPathExists=!/var/lib/first-boot-set-mac/%i Wants=mapper-wait@-xyz-openbmc_project-inventory.service After=mapper-wait@-xyz-openbmc_project-inventory.service Wants=mapper-wait@-xyz-openbmc_project-network-%i.service diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index f7742c85e..23ff3475c 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -16,15 +16,18 @@ IMAGE_BASETYPE ?= "squashfs-xz" OVERLAY_BASETYPE ?= "jffs2" FLASH_UBI_BASETYPE ?= "${IMAGE_BASETYPE}" FLASH_UBI_OVERLAY_BASETYPE ?= "ubifs" +FLASH_EXT4_BASETYPE ?= "ext4" +FLASH_EXT4_OVERLAY_BASETYPE ?= "ext4" -IMAGE_TYPES += "mtd-static mtd-static-alltar mtd-static-tar mtd-ubi mtd-ubi-tar" +IMAGE_TYPES += "mtd-static mtd-static-alltar mtd-static-tar mtd-ubi mtd-ubi-tar mmc-ext4-tar" IMAGE_TYPEDEP_mtd-static = "${IMAGE_BASETYPE}" IMAGE_TYPEDEP_mtd-static-tar = "${IMAGE_BASETYPE}" IMAGE_TYPEDEP_mtd-static-alltar = "mtd-static" IMAGE_TYPEDEP_mtd-ubi = "${FLASH_UBI_BASETYPE}" IMAGE_TYPEDEP_mtd-ubi-tar = "${FLASH_UBI_BASETYPE}" -IMAGE_TYPES_MASKED += "mtd-static mtd-static-alltar mtd-static-tar mtd-ubi mtd-ubi-tar" +IMAGE_TYPEDEP_mmc-ext4-tar = "${FLASH_EXT4_BASETYPE}" +IMAGE_TYPES_MASKED += "mtd-static mtd-static-alltar mtd-static-tar mtd-ubi mtd-ubi-tar mmc-ext4-tar" # Flash characteristics in KB unless otherwise noted DISTROOVERRIDES .= ":flash-${FLASH_SIZE}" @@ -77,21 +80,33 @@ python() { # Instead, prefix the overlay override value with 'rwfs-' to avoid collisions. DISTROOVERRIDES .= ":static-rwfs-${OVERLAY_BASETYPE}" DISTROOVERRIDES .= ":ubi-rwfs-${FLASH_UBI_OVERLAY_BASETYPE}" +DISTROOVERRIDES .= ":mmc-rwfs-${FLASH_EXT4_OVERLAY_BASETYPE}" JFFS2_RWFS_CMD = "mkfs.jffs2 --root=jffs2 --faketime --output=${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.jffs2" UBIFS_RWFS_CMD = "mkfs.ubifs -r ubifs -c ${FLASH_UBI_RWFS_LEBS} -m ${FLASH_PAGE_SIZE} -e ${FLASH_LEB_SIZE} ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ubifs" +EXT4_RWFS_CMD = "mkfs.ext4 -F ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.rwfs.ext4" FLASH_STATIC_RWFS_CMD_static-rwfs-jffs2 = "${JFFS2_RWFS_CMD}" FLASH_UBI_RWFS_CMD_ubi-rwfs-jffs2 = "${JFFS2_RWFS_CMD}" FLASH_UBI_RWFS_CMD_ubi-rwfs-ubifs = "${UBIFS_RWFS_CMD}" +FLASH_EXT4_RWFS_CMD_mmc-rwfs-ext4 = "${EXT4_RWFS_CMD}" -mk_nor_image() { +mk_empty_image() { image_dst="$1" image_size_kb=$2 dd if=/dev/zero bs=1k count=$image_size_kb \ | tr '\000' '\377' > $image_dst } +clean_rwfs() { + type=$1 + shift + + rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type + rm -rf $type + mkdir $type +} + make_rwfs() { type=$1 cmd=$2 @@ -99,14 +114,13 @@ make_rwfs() { shift opts="$@" - rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type - rm -rf $type - mkdir $type + mkdir -p $type $cmd $opts } do_generate_rwfs_static() { + clean_rwfs ${OVERLAY_BASETYPE} make_rwfs ${OVERLAY_BASETYPE} "${FLASH_STATIC_RWFS_CMD}" ${OVERLAY_MKFS_OPTS} } do_generate_rwfs_static[dirs] = " ${S}/static" @@ -115,6 +129,7 @@ do_generate_rwfs_static[depends] += " \ " do_generate_rwfs_ubi() { + clean_rwfs ${FLASH_UBI_OVERLAY_BASETYPE} make_rwfs ${FLASH_UBI_OVERLAY_BASETYPE} "${FLASH_UBI_RWFS_CMD}" } do_generate_rwfs_ubi[dirs] = " ${S}/ubi" @@ -122,6 +137,16 @@ do_generate_rwfs_ubi[depends] += " \ mtd-utils-native:do_populate_sysroot \ " +do_generate_rwfs_ext4() { + clean_rwfs rwfs.${FLASH_EXT4_OVERLAY_BASETYPE} + mk_empty_image ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.rwfs.ext4 1024 + make_rwfs ${FLASH_EXT4_OVERLAY_BASETYPE} "${FLASH_EXT4_RWFS_CMD}" ${OVERLAY_MKFS_OPTS} +} +do_generate_rwfs_ext4[dirs] = " ${S}/ext4" +do_generate_rwfs_ext4[depends] += " \ + e2fsprogs-native:do_populate_sysroot \ + " + add_volume() { config_file=$1 vol_id=$2 @@ -170,7 +195,7 @@ do_make_ubi() { ubinize -p ${FLASH_PEB_SIZE}KiB -m ${FLASH_PAGE_SIZE} -o ubi-img $cfg # Concatenate the uboot and ubi partitions - mk_nor_image ${IMGDEPLOYDIR}/${IMAGE_NAME}.ubi.mtd ${FLASH_SIZE} + mk_empty_image ${IMGDEPLOYDIR}/${IMAGE_NAME}.ubi.mtd ${FLASH_SIZE} dd bs=1k conv=notrunc seek=${FLASH_UBOOT_OFFSET} \ if=${DEPLOY_DIR_IMAGE}/u-boot.${UBOOT_SUFFIX} \ of=${IMGDEPLOYDIR}/${IMAGE_NAME}.ubi.mtd @@ -191,7 +216,7 @@ do_make_ubi[depends] += " \ do_mk_static_nor_image() { # Assemble the flash image - mk_nor_image ${IMGDEPLOYDIR}/${IMAGE_NAME}.static.mtd ${FLASH_SIZE} + mk_empty_image ${IMGDEPLOYDIR}/${IMAGE_NAME}.static.mtd ${FLASH_SIZE} } python do_generate_static() { @@ -314,11 +339,11 @@ make_tar_of_images() { extra_files="$@" # Create the tar archive - tar -h -cvf ${IMGDEPLOYDIR}/${IMAGE_NAME}.$type.mtd.tar \ + tar -h -cvf ${IMGDEPLOYDIR}/${IMAGE_NAME}.$type.tar \ image-u-boot image-kernel image-rofs image-rwfs $extra_files cd ${IMGDEPLOYDIR} - ln -sf ${IMAGE_NAME}.$type.mtd.tar ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type.mtd.tar + ln -sf ${IMAGE_NAME}.$type.tar ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type.tar } do_generate_static_tar() { @@ -326,7 +351,7 @@ do_generate_static_tar() { ln -sf ${S}/publickey publickey make_image_links ${OVERLAY_BASETYPE} ${IMAGE_BASETYPE} make_signatures image-u-boot image-kernel image-rofs image-rwfs MANIFEST publickey - make_tar_of_images static MANIFEST publickey ${signature_files} + make_tar_of_images static.mtd MANIFEST publickey ${signature_files} # Maintain non-standard legacy link. cd ${IMGDEPLOYDIR} @@ -348,7 +373,7 @@ do_generate_ubi_tar() { ln -sf ${S}/publickey publickey make_image_links ${FLASH_UBI_OVERLAY_BASETYPE} ${FLASH_UBI_BASETYPE} make_signatures image-u-boot image-kernel image-rofs image-rwfs MANIFEST publickey - make_tar_of_images ubi MANIFEST publickey ${signature_files} + make_tar_of_images ubi.mtd MANIFEST publickey ${signature_files} } do_generate_ubi_tar[dirs] = " ${S}/ubi" do_generate_ubi_tar[depends] += " \ @@ -360,6 +385,23 @@ do_generate_ubi_tar[depends] += " \ ${PN}:do_copy_signing_pubkey \ " +do_generate_ext4_tar() { + ln -sf ${S}/MANIFEST MANIFEST + ln -sf ${S}/publickey publickey + make_image_links rwfs.${FLASH_EXT4_OVERLAY_BASETYPE} ${FLASH_EXT4_BASETYPE} + make_signatures image-u-boot image-kernel image-rofs image-rwfs MANIFEST publickey + make_tar_of_images ext4.mmc MANIFEST publickey ${signature_files} +} +do_generate_ext4_tar[dirs] = " ${S}/ext4" +do_generate_ext4_tar[depends] += " \ + ${PN}:do_image_${FLASH_EXT4_BASETYPE} \ + virtual/kernel:do_deploy \ + u-boot:do_populate_sysroot \ + openssl-native:do_populate_sysroot \ + ${SIGNING_KEY_DEPENDS} \ + ${PN}:do_copy_signing_pubkey \ + " + def get_pubkey_basedir(d): return os.path.join( d.getVar('STAGING_DIR_TARGET', True), @@ -377,11 +419,13 @@ def get_pubkey_path(d): python do_generate_phosphor_manifest() { version = do_get_version(d) + target_machine = d.getVar('MACHINE', True) with open('MANIFEST', 'w') as fd: fd.write('purpose=xyz.openbmc_project.Software.Version.VersionPurpose.BMC\n') fd.write('version={}\n'.format(version.strip('"'))) fd.write('KeyType={}\n'.format(get_pubkey_type(d))) fd.write('HashType=RSA-SHA256\n') + fd.write('MachineName={}\n'.format(target_machine)) } do_generate_phosphor_manifest[dirs] = "${S}" do_generate_phosphor_manifest[depends] += " \ @@ -404,6 +448,7 @@ addtask copy_signing_pubkey after do_rootfs addtask generate_phosphor_manifest after do_rootfs addtask generate_rwfs_static after do_rootfs addtask generate_rwfs_ubi after do_rootfs +addtask generate_rwfs_ext4 after do_rootfs python() { types = d.getVar('IMAGE_FSTYPES', True).split() @@ -434,4 +479,10 @@ python() { 'do_generate_ubi_tar', 'do_image_complete', 'do_generate_rwfs_ubi do_generate_phosphor_manifest', d) + + if 'mmc-ext4-tar' in types: + bb.build.addtask( + 'do_generate_ext4_tar', + 'do_image_complete', + 'do_generate_rwfs_ext4 do_generate_phosphor_manifest', d) } diff --git a/meta-phosphor/classes/mrw-xml.bbclass b/meta-phosphor/classes/mrw-xml.bbclass index 5a9c773ae..8876de706 100644 --- a/meta-phosphor/classes/mrw-xml.bbclass +++ b/meta-phosphor/classes/mrw-xml.bbclass @@ -1,2 +1,4 @@ MRW_XML ??= "${MACHINE}.xml" mrw_datadir = "${datadir}/obmc-mrw" +SKIP_BROKEN_MRW ?= "0" +EXTRA_MRW_SCRIPT_ARGS = "${@bb.utils.contains("SKIP_BROKEN_MRW", "0", "", "--skip-broken-mrw", d)}" diff --git a/meta-phosphor/classes/phosphor-networkd-rev.bbclass b/meta-phosphor/classes/phosphor-networkd-rev.bbclass index 57878ddac..1c8a01a6c 100644 --- a/meta-phosphor/classes/phosphor-networkd-rev.bbclass +++ b/meta-phosphor/classes/phosphor-networkd-rev.bbclass @@ -1,2 +1,2 @@ SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "046b2a0b3707621a3828da1318b628bcc31d1aaa" +SRCREV = "cb42fe26febc9e457a9c4279278bd8c85f60851a" diff --git a/meta-phosphor/recipes-connectivity/avahi/avahi-daemon/avahi-daemon-override.conf b/meta-phosphor/recipes-connectivity/avahi/avahi-daemon/avahi-daemon-override.conf new file mode 100644 index 000000000..9a594c6e1 --- /dev/null +++ b/meta-phosphor/recipes-connectivity/avahi/avahi-daemon/avahi-daemon-override.conf @@ -0,0 +1,3 @@ +[Service] +ExecStartPre=/bin/sh -c "grep -q avahi: /etc/group || /usr/sbin/addgroup --system avahi" +ExecStartPre=/bin/sh -c "grep -q avahi: /etc/passwd || /usr/sbin/adduser --system --no-create-home --ingroup avahi avahi" diff --git a/meta-phosphor/recipes-connectivity/avahi/avahi_%.bbappend b/meta-phosphor/recipes-connectivity/avahi/avahi_%.bbappend new file mode 100644 index 000000000..ee15899fa --- /dev/null +++ b/meta-phosphor/recipes-connectivity/avahi/avahi_%.bbappend @@ -0,0 +1,11 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/avahi-daemon:" + +SRC_URI += "file://avahi-daemon-override.conf" + +FILES_avahi-daemon_append += "${systemd_system_unitdir}/avahi-daemon.service.d/avahi-daemon-override.conf" + +do_install_append() { + + install -m 644 -D ${WORKDIR}/avahi-daemon-override.conf \ + ${D}${systemd_system_unitdir}/avahi-daemon.service.d/avahi-daemon-override.conf +} diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 765ae6f71..6e6fd1eaf 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git" -SRCREV = "ce80db74ee4eceef3dcd236c74ba4d2aaaf76bda" +SRCREV = "978fcadadc8320ff5356ed1a5dc25e3284e3745f" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index 84d9cdf9b..d34d1ca54 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -14,7 +14,7 @@ DEPENDS += "autoconf-archive-native" DEPENDS += "sdbus++-native" SRC_URI += "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "7aa705a9356c16d3540943a0436ea09c0fa61ab2" +SRCREV = "9cb4a711cff999b373cf98b44cc18b9001c1395a" DEPENDS_remove_class-native = "sdbus++-native" DEPENDS_remove_class-nativesdk = "sdbus++-native" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb index faac52ce5..90fa3ac40 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-dbus-monitor" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-dbus-monitor" -SRCREV = "91e14a58027e8084eb114e0afce6081a6a95a478" +SRCREV = "22bf9008271a2f084a3369f7550a4b66305649dd" inherit autotools \ pkgconfig \ diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 0c6092a9e..4b3eaf4af 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence" -SRCREV = "301ec595f551393ebe0624e64b4b40bfc3bc1fcf" +SRCREV = "799cdf74d50c6ced0e1a1afcef1fe7fc50e71da8" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index 17a9e385b..30b8078d9 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" -SRCREV = "85c356f76fe07db3c1253c48f5b35c5811a15c07" +SRCREV = "5a7363b4cfdf995a6bebb80b6fe1cd3514c593a6" diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index dab8e0dd3..b81e580cf 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "a3268f98f308ca7c8660b1ace44d5b9a40be204b" +SRCREV = "717794d5465c54e07a1247db9e9d7ec68b0d6cc6" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc index d046e4a8d..cee138864 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-inventory-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-inventory-manager" -SRCREV = "ded627c42f5e5319e3704fff742a0227c05f00a9"
\ No newline at end of file +SRCREV = "bbacd2326f84fb821c634e3cdfa78c2c7fedc0cf"
\ No newline at end of file diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb index bb16749a9..f871088df 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb @@ -14,4 +14,4 @@ EXTRA_OECONF = "--disable-tests" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ipmi-blob-tool" -SRCREV = "958f1ce952849300ebfd30cc04ce86937d3bc718" +SRCREV = "00f39b84037a840a1b169a8017be75ac6636cb6f" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index 09bf1029b..feea0ec32 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -44,7 +44,7 @@ EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "6749ba1c93c9b4f65c9ef7791987fc2f98bc15d1" +SRCREV = "a9f674c5ba0436382ee839f463e2e4d120272de7" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb index f6b63dfe3..5869bb7c2 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb @@ -16,7 +16,7 @@ DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-host" SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "ddba9d15af607274462fc3372b3d72393d03899a" +SRCREV = "dafe36444fa438030fdf27089b0e94d8d88411dc" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index aeae1ff35..6728b0777 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -54,7 +54,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "14d671fa2311144fe43047486c4938e9c461ce24" +SRCREV = "31eed996da81cf6e35e7ddd035aa8088be230218" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb index a810faf58..b33df921d 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb @@ -19,7 +19,7 @@ SRC_URI += "git://github.com/openbmc/mboxbridge.git" SRC_URI += "file://99-aspeed-lpc-ctrl.rules" SRC_URI += "file://aspeed-lpc-ctrl-h.patch" -SRCREV="7e3f20d02f6555d082cdc320790ac8fd9976effb" +SRCREV="0acc669979cc5b1b66c2c4e5d975c60779bedd81" PROVIDES += "mboxctl" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc new file mode 100644 index 000000000..149d51ef9 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -0,0 +1,5 @@ +HOMEPAGE = "https://github.com/openbmc/pldm" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" +SRC_URI = "git://github.com/openbmc/pldm" +SRCREV = "497665acdb655e965545becf97c2ccf41545ac6f" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb new file mode 100644 index 000000000..c09e5dd02 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb @@ -0,0 +1,22 @@ +SUMMARY = "PLDM Stack" +DESCRIPTION = "Implementation of the PLDM specifications" +PR = "r1" +PV = "1.0+git${SRCPV}" + +inherit meson pkgconfig + +require pldm.inc + +DEPENDS += "systemd" +DEPENDS += "phosphor-logging" +DEPENDS += "phosphor-dbus-interfaces" +DEPENDS += "nlohmann-json" +DEPENDS += "boost" +DEPENDS += "cli11" + +S = "${WORKDIR}/git" + +EXTRA_OEMESON = " \ + -Dtests=disabled \ + -Doem-ibm=disabled \ + " diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 1d70a0c3f..d3cd73c7f 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "1a70a588dc6d57e68e684a789f46178efeeaf1cb" +SRCREV = "4316218ab824c3c60f566b38f620a6d778e45a83" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index 6697c7a3d..e3d276ea2 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -39,7 +39,7 @@ SRC_URI += "file://70-hwmon.rules" SRC_URI += "file://70-iio.rules" SRC_URI += "file://start_hwmon.sh" -SRCREV = "778f5c39b1e53ee291f10a6d4d13d8fb16bbc112" +SRCREV = "ddbf1c68e33f18797fafffc4615b19178b9fdb8d" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 7cae3902a..c30d191ec 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -147,6 +147,6 @@ do_install_append() { } SRC_URI += "git://github.com/openbmc/phosphor-state-manager" -SRCREV = "60c3ac8c874da1a037cb338ca033655a122aca9d" +SRCREV = "a6e7bbf0d63b33382448a62ae08661ef17f60e64" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index 82c78a915..766074e58 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-webui.git" -SRCREV = "ff7f10685d0ce060bf2d1a90872c0c6016711b41" +SRCREV = "5e930c0aeb5b66df2c357be4d5c33d4828c2783f" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " diff --git a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/init_once.sh b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/init_once.sh index 71116fbe9..08aa7a054 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/init_once.sh +++ b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/init_once.sh @@ -45,8 +45,8 @@ do CLOCK_GEN_VALUE=$(printf '0x%x\n' \ "$(($CLOCK_GEN_VALUE | 0x$update_value))") else - set_gpio_direction "${RST_BMC_U2[$1]}" "low" - set_gpio_direction "${POWER_U2[$1]}" "low" + set_gpio_direction "${RST_BMC_U2[$i]}" "low" + set_gpio_direction "${POWER_U2[$i]}" "low" CLOCK_GEN_VALUE=$(printf '0x%x\n' \ "$(($CLOCK_GEN_VALUE & ~0x$update_value))") diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch b/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch deleted file mode 100644 index 391b26a1c..000000000 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 5bf85d04b440ce874310e701abded823dc1864bc Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan <andrei@balena.io> -Date: Wed, 17 Jul 2019 15:32:11 +0100 -Subject: [PATCH 1/7] configs: rpi4: Add defconfigs for rpi4 (32/64) - -This defines a minimum defconfig for each of the two Raspberry Pi 4 -variants. One notable difference is that we don't have a embedded dt for -this board given that the fw supplies us with one which we can reuse. -Furthermore, the ram size is not queryable through mbox interface as the -maximum reported size is 1G. The fw patches the dt with the right -memory configuration and uboot uses it as it is. We avoid u-boot -touching this configuration by making sure CONFIG_ARCH_FIXUP_FDT_MEMORY -is deactivated. - -Signed-off-by: Andrei Gherzan <andrei@balena.io> -Upstream-status: Pending ---- - configs/rpi_4_32b_defconfig | 33 +++++++++++++++++++++++++++++++++ - configs/rpi_4_defconfig | 33 +++++++++++++++++++++++++++++++++ - 2 files changed, 66 insertions(+) - create mode 100644 configs/rpi_4_32b_defconfig - create mode 100644 configs/rpi_4_defconfig - -diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig -new file mode 100644 -index 0000000000..a31a617a5f ---- /dev/null -+++ b/configs/rpi_4_32b_defconfig -@@ -0,0 +1,33 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_BCM283X=y -+CONFIG_SYS_TEXT_BASE=0x00008000 -+CONFIG_TARGET_RPI_4_32B=y -+CONFIG_SYS_MALLOC_F_LEN=0x2000 -+CONFIG_DISTRO_DEFAULTS=y -+CONFIG_NR_DRAM_BANKS=1 -+# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set -+CONFIG_OF_BOARD=y -+CONFIG_OF_BOARD_SETUP=y -+CONFIG_MISC_INIT_R=y -+# CONFIG_DISPLAY_CPUINFO is not set -+# CONFIG_DISPLAY_BOARDINFO is not set -+CONFIG_SYS_PROMPT="U-Boot> " -+# CONFIG_CMD_FLASH is not set -+CONFIG_CMD_GPIO=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_FS_UUID=y -+CONFIG_ENV_FAT_INTERFACE="mmc" -+CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" -+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -+CONFIG_DM_KEYBOARD=y -+CONFIG_DM_MMC=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_BCM2835=y -+CONFIG_PINCTRL=y -+# CONFIG_PINCTRL_GENERIC is not set -+# CONFIG_REQUIRE_SERIAL_CONSOLE is not set -+CONFIG_DM_VIDEO=y -+CONFIG_SYS_WHITE_ON_BLACK=y -+CONFIG_CONSOLE_SCROLL_LINES=10 -+CONFIG_PHYS_TO_BUS=y -+CONFIG_OF_LIBFDT_OVERLAY=y -diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig -new file mode 100644 -index 0000000000..da8c960a2a ---- /dev/null -+++ b/configs/rpi_4_defconfig -@@ -0,0 +1,33 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_BCM283X=y -+CONFIG_SYS_TEXT_BASE=0x00080000 -+CONFIG_TARGET_RPI_4=y -+CONFIG_SYS_MALLOC_F_LEN=0x2000 -+CONFIG_DISTRO_DEFAULTS=y -+CONFIG_NR_DRAM_BANKS=1 -+# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set -+CONFIG_OF_BOARD=y -+CONFIG_OF_BOARD_SETUP=y -+CONFIG_MISC_INIT_R=y -+# CONFIG_DISPLAY_CPUINFO is not set -+# CONFIG_DISPLAY_BOARDINFO is not set -+CONFIG_SYS_PROMPT="U-Boot> " -+# CONFIG_CMD_FLASH is not set -+CONFIG_CMD_GPIO=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_FS_UUID=y -+CONFIG_ENV_FAT_INTERFACE="mmc" -+CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" -+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -+CONFIG_DM_KEYBOARD=y -+CONFIG_DM_MMC=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_BCM2835=y -+CONFIG_PINCTRL=y -+# CONFIG_PINCTRL_GENERIC is not set -+# CONFIG_REQUIRE_SERIAL_CONSOLE is not set -+CONFIG_DM_VIDEO=y -+CONFIG_SYS_WHITE_ON_BLACK=y -+CONFIG_CONSOLE_SCROLL_LINES=10 -+CONFIG_PHYS_TO_BUS=y -+CONFIG_OF_LIBFDT_OVERLAY=y --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0002-ARM-bcm283x-Add-BCM283x_BASE-define.patch b/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0002-ARM-bcm283x-Add-BCM283x_BASE-define.patch deleted file mode 100644 index fcf91a6a7..000000000 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0002-ARM-bcm283x-Add-BCM283x_BASE-define.patch +++ /dev/null @@ -1,105 +0,0 @@ -From df2aa4c6be33b468adc09de337a055556d1f37fb Mon Sep 17 00:00:00 2001 -From: Matthias Brugger <mbrugger@suse.com> -Date: Fri, 12 Jul 2019 18:20:53 +0200 -Subject: [PATCH 2/7] ARM: bcm283x: Add BCM283x_BASE define - -Devices of bcm283x have different base address, depending if they are on -bcm2835 or bcm2836/7. Use BCM283x_BASE depending on the SoC you want to -build and only add the offset in the header files. - -Signed-off-by: Matthias Brugger <mbrugger@suse.com> -Signed-off-by: Andrei Gherzan <andrei@balena.io> -Upstream-status: Pending ---- - arch/arm/mach-bcm283x/Kconfig | 5 +++++ - arch/arm/mach-bcm283x/include/mach/mbox.h | 6 +----- - arch/arm/mach-bcm283x/include/mach/sdhci.h | 6 +----- - arch/arm/mach-bcm283x/include/mach/timer.h | 6 +----- - arch/arm/mach-bcm283x/include/mach/wdog.h | 6 +----- - 5 files changed, 9 insertions(+), 20 deletions(-) - -diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig -index 3eb5a9a897..8e69914a83 100644 ---- a/arch/arm/mach-bcm283x/Kconfig -+++ b/arch/arm/mach-bcm283x/Kconfig -@@ -141,4 +141,9 @@ config SYS_SOC - config SYS_CONFIG_NAME - default "rpi" - -+config BCM283x_BASE -+ hex -+ default "0x20000000" if BCM2835 -+ default "0x3f000000" if BCM2836 || BCM2837 -+ - endmenu -diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h -index e3a893e49c..e44c7577da 100644 ---- a/arch/arm/mach-bcm283x/include/mach/mbox.h -+++ b/arch/arm/mach-bcm283x/include/mach/mbox.h -@@ -37,11 +37,7 @@ - - /* Raw mailbox HW */ - --#ifndef CONFIG_BCM2835 --#define BCM2835_MBOX_PHYSADDR 0x3f00b880 --#else --#define BCM2835_MBOX_PHYSADDR 0x2000b880 --#endif -+#define BCM2835_MBOX_PHYSADDR (CONFIG_BCM283x_BASE + 0x0000b880) - - struct bcm2835_mbox_regs { - u32 read; -diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h -index 5cb6ec3340..b443c379d8 100644 ---- a/arch/arm/mach-bcm283x/include/mach/sdhci.h -+++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h -@@ -6,11 +6,7 @@ - #ifndef _BCM2835_SDHCI_H_ - #define _BCM2835_SDHCI_H_ - --#ifndef CONFIG_BCM2835 --#define BCM2835_SDHCI_BASE 0x3f300000 --#else --#define BCM2835_SDHCI_BASE 0x20300000 --#endif -+#define BCM2835_SDHCI_BASE (CONFIG_BCM283x_BASE + 0x00300000) - - int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq); - -diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h -index 56b0c356bb..014355e759 100644 ---- a/arch/arm/mach-bcm283x/include/mach/timer.h -+++ b/arch/arm/mach-bcm283x/include/mach/timer.h -@@ -6,11 +6,7 @@ - #ifndef _BCM2835_TIMER_H - #define _BCM2835_TIMER_H - --#ifndef CONFIG_BCM2835 --#define BCM2835_TIMER_PHYSADDR 0x3f003000 --#else --#define BCM2835_TIMER_PHYSADDR 0x20003000 --#endif -+#define BCM2835_TIMER_PHYSADDR (CONFIG_BCM283x_BASE + 0x00003000) - - #define BCM2835_TIMER_CS_M3 (1 << 3) - #define BCM2835_TIMER_CS_M2 (1 << 2) -diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h -index 99c88e5df7..00b5e06c3a 100644 ---- a/arch/arm/mach-bcm283x/include/mach/wdog.h -+++ b/arch/arm/mach-bcm283x/include/mach/wdog.h -@@ -6,11 +6,7 @@ - #ifndef _BCM2835_WDOG_H - #define _BCM2835_WDOG_H - --#ifndef CONFIG_BCM2835 --#define BCM2835_WDOG_PHYSADDR 0x3f100000 --#else --#define BCM2835_WDOG_PHYSADDR 0x20100000 --#endif -+#define BCM2835_WDOG_PHYSADDR (CONFIG_BCM283x_BASE + 0x00100000) - - struct bcm2835_wdog_regs { - u32 unknown0[7]; --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0003-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch b/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0003-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch deleted file mode 100644 index 029cac496..000000000 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0003-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch +++ /dev/null @@ -1,108 +0,0 @@ -From c03f551cab8fe38de8f0e1781f0e2e339419b003 Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan <andrei@balena.io> -Date: Wed, 17 Jul 2019 15:33:01 +0100 -Subject: [PATCH 3/7] arm: mach-bcm283x: Define configs for RaspberryPi 4 - -Define two target configs for Raspberry Pi 4 (32 and 64bit) and the -corresponding BCM2838* configs. - -Be aware of the current limitation in firmware which requires an -explicit configuration to force the arm in 64bit mode when the -respective target is used. - -Signed-off-by: Andrei Gherzan <andrei@balena.io> -Signed-off-by: Matthias Brugger <mbrugger@suse.com> -Upstream-status: Pending ---- - arch/arm/mach-bcm283x/Kconfig | 62 +++++++++++++++++++++++++++++++++++ - 1 file changed, 62 insertions(+) - -diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig -index 8e69914a83..09a5b42bbb 100644 ---- a/arch/arm/mach-bcm283x/Kconfig -+++ b/arch/arm/mach-bcm283x/Kconfig -@@ -26,6 +26,23 @@ config BCM2837_64B - select BCM2837 - select ARM64 - -+config BCM2838 -+ bool "Broadcom BCM2838 SoC support" -+ depends on ARCH_BCM283X -+ -+config BCM2838_32B -+ bool "Broadcom BCM2838 SoC 32-bit support" -+ depends on ARCH_BCM283X -+ select BCM2838 -+ select ARMV7_LPAE -+ select CPU_V7A -+ -+config BCM2838_64B -+ bool "Broadcom BCM2838 SoC 64-bit support" -+ depends on ARCH_BCM283X -+ select BCM2838 -+ select ARM64 -+ - menu "Broadcom BCM283X family" - depends on ARCH_BCM283X - -@@ -127,6 +144,50 @@ config TARGET_RPI_3 - This option creates a build targeting the ARMv8/AArch64 ISA. - select BCM2837_64B - -+config TARGET_RPI_4_32B -+ bool "Raspberry Pi 4 32-bit build" -+ help -+ Support for all BCM2838-based Raspberry Pi variants, such as -+ the RPi 4 model B, in AArch32 (32-bit) mode. -+ -+ This option assumes the VideoCore firmware is configured to use the -+ mini UART (rather than PL011) for the serial console. This is the -+ default on the RPi 4. To enable the UART console, the following non- -+ default option must be present in config.txt: enable_uart=1. This is -+ required for U-Boot to operate correctly, even if you only care -+ about the HDMI/usbkbd console. -+ -+ Due to hardware incompatibilities, this can't be used with -+ BCM283/5/6/7. -+ -+ This option creates a build targeting the ARMv7/AArch32 ISA. -+ select BCM2838_32B -+ -+config TARGET_RPI_4 -+ bool "Raspberry Pi 4 64-bit build" -+ help -+ Support for all BCM2838-based Raspberry Pi variants, such as -+ the RPi 4 model B, in AArch64 (64-bit) mode. -+ -+ This option assumes the VideoCore firmware is configured to use the -+ mini UART (rather than PL011) for the serial console. This is the -+ default on the RPi 4. To enable the UART console, the following non- -+ default option must be present in config.txt: enable_uart=1. This is -+ required for U-Boot to operate correctly, even if you only care -+ about the HDMI/usbkbd console. -+ -+ Due to hardware incompatibilities, this can't be used with -+ BCM283/5/6/7. -+ -+ Also, due to a bug in firmware, switching to 64bit mode doesn't -+ happen automatically based on the kernel's image filename. See -+ https://github.com/raspberrypi/firmware/issues/1193 for more details. -+ Until that is resolved, the configuration (config.txt) needs to -+ explicitly set: arm_64bit=1. -+ -+ This option creates a build targeting the ARMv8/AArch64 ISA. -+ select BCM2838_64B -+ - endchoice - - config SYS_BOARD -@@ -145,5 +206,6 @@ config BCM283x_BASE - hex - default "0x20000000" if BCM2835 - default "0x3f000000" if BCM2836 || BCM2837 -+ default "0xfe000000" if BCM2838 - - endmenu --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0004-rpi-Add-entry-for-Raspberry-Pi-4-model-B.patch b/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0004-rpi-Add-entry-for-Raspberry-Pi-4-model-B.patch deleted file mode 100644 index 7309d2b22..000000000 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0004-rpi-Add-entry-for-Raspberry-Pi-4-model-B.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 12fbbd5bc12e225b19d3b4cb193a1bf3d9fa752a Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan <andrei@balena.io> -Date: Wed, 17 Jul 2019 15:34:18 +0100 -Subject: [PATCH 4/7] rpi: Add entry for Raspberry Pi 4 model B - -The Raspebrry Pi 4 uses the new revision code scheme as documented by -the foundation. This change adds an entry for this board as well. - -Signed-off-by: Andrei Gherzan <andrei@balena.io> -Upstream-status: Pending ---- - board/raspberrypi/rpi/rpi.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c -index 617c892dde..92c6534da6 100644 ---- a/board/raspberrypi/rpi/rpi.c -+++ b/board/raspberrypi/rpi/rpi.c -@@ -148,6 +148,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { - DTB_DIR "bcm2837-rpi-cm3.dtb", - false, - }, -+ [0x11] = { -+ "4 Model B", -+ DTB_DIR "bcm2838-rpi-4-b.dtb", -+ true, -+ }, - }; - - static const struct rpi_model rpi_models_old_scheme[] = { --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0005-arm-bcm283x-Include-definition-for-additional-emmc-c.patch b/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0005-arm-bcm283x-Include-definition-for-additional-emmc-c.patch deleted file mode 100644 index 44847e017..000000000 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0005-arm-bcm283x-Include-definition-for-additional-emmc-c.patch +++ /dev/null @@ -1,30 +0,0 @@ -From fd99a249e6faf234066a6b5da2ed34aaead3d6d9 Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan <andrei@balena.io> -Date: Fri, 12 Jul 2019 11:26:10 +0100 -Subject: [PATCH 5/7] arm: bcm283x: Include definition for additional emmc - clock - -This clock has a different mbox ID so have this included in the relevant -header file. - -Signed-off-by: Andrei Gherzan <andrei@balena.io> -Upstream-status: Pending ---- - arch/arm/mach-bcm283x/include/mach/mbox.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h -index e44c7577da..f2a98acddd 100644 ---- a/arch/arm/mach-bcm283x/include/mach/mbox.h -+++ b/arch/arm/mach-bcm283x/include/mach/mbox.h -@@ -230,6 +230,7 @@ struct bcm2835_mbox_tag_set_power_state { - #define BCM2835_MBOX_CLOCK_ID_SDRAM 8 - #define BCM2835_MBOX_CLOCK_ID_PIXEL 9 - #define BCM2835_MBOX_CLOCK_ID_PWM 10 -+#define BCM2835_MBOX_CLOCK_ID_EMMC2 12 - - struct bcm2835_mbox_tag_get_clock_rate { - struct bcm2835_mbox_tag_hdr tag_hdr; --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch b/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch deleted file mode 100644 index d9de5c425..000000000 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 1f42758fe69648340cfae6cae98e667b88923cf6 Mon Sep 17 00:00:00 2001 -From: Matthias Brugger <mbrugger@suse.com> -Date: Wed, 10 Jul 2019 13:24:36 +0200 -Subject: [PATCH 6/7] mmc: bcm2835_sdhci: Add support for bcm2711 device - -The bcm2711 has two emmc controller. The difference is the clocks -they use. Add support for the second emmc contoller. - -Signed-off-by: Matthias Brugger <mbrugger@suse.com> -Signed-off-by: Andrei Gherzan <andrei@balena.io> -Upstream-status: Pending ---- - drivers/mmc/bcm2835_sdhci.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c -index 08bddd410e..e68dec3be7 100644 ---- a/drivers/mmc/bcm2835_sdhci.c -+++ b/drivers/mmc/bcm2835_sdhci.c -@@ -178,12 +178,13 @@ static int bcm2835_sdhci_probe(struct udevice *dev) - fdt_addr_t base; - int emmc_freq; - int ret; -+ int clock_id = (int)dev_get_driver_data(dev); - - base = devfdt_get_addr(dev); - if (base == FDT_ADDR_T_NONE) - return -EINVAL; - -- ret = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_EMMC); -+ ret = bcm2835_get_mmc_clock(clock_id); - if (ret < 0) { - debug("%s: Failed to set MMC clock (err=%d)\n", __func__, ret); - return ret; -@@ -228,7 +229,14 @@ static int bcm2835_sdhci_probe(struct udevice *dev) - } - - static const struct udevice_id bcm2835_sdhci_match[] = { -- { .compatible = "brcm,bcm2835-sdhci" }, -+ { -+ .compatible = "brcm,bcm2835-sdhci", -+ .data = BCM2835_MBOX_CLOCK_ID_EMMC -+ }, -+ { -+ .compatible = "brcm,bcm2711-emmc2", -+ .data = BCM2835_MBOX_CLOCK_ID_EMMC2 -+ }, - { /* sentinel */ } - }; - --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0007-rpi-Add-memory-map-for-bcm2838.patch b/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0007-rpi-Add-memory-map-for-bcm2838.patch deleted file mode 100644 index 1d23d9f99..000000000 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-2019.07/0007-rpi-Add-memory-map-for-bcm2838.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 76b656349a6786fa81cf69ac7762c31675cd567e Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan <andrei@balena.io> -Date: Fri, 12 Jul 2019 14:27:31 +0100 -Subject: [PATCH 7/7] rpi: Add memory map for bcm2838 - -Define the memory map for the BCM2838 based on the dt configuration -available in the Raspberry Pi kernel fork. - -Signed-off-by: Andrei Gherzan <andrei@balena.io> -Upstream-status: Pending ---- - board/raspberrypi/rpi/rpi.c | 27 ++++++++++++++++++++++++--- - 1 file changed, 24 insertions(+), 3 deletions(-) - -diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c -index 92c6534da6..bddf2a578d 100644 ---- a/board/raspberrypi/rpi/rpi.c -+++ b/board/raspberrypi/rpi/rpi.c -@@ -249,7 +249,8 @@ static uint32_t rev_type; - static const struct rpi_model *model; - - #ifdef CONFIG_ARM64 --static struct mm_region bcm2837_mem_map[] = { -+#ifndef CONFIG_BCM2838 -+static struct mm_region bcm283x_mem_map[] = { - { - .virt = 0x00000000UL, - .phys = 0x00000000UL, -@@ -268,8 +269,28 @@ static struct mm_region bcm2837_mem_map[] = { - 0, - } - }; -- --struct mm_region *mem_map = bcm2837_mem_map; -+#else -+static struct mm_region bcm283x_mem_map[] = { -+ { -+ .virt = 0x00000000UL, -+ .phys = 0x00000000UL, -+ .size = 0xfe000000UL, -+ .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | -+ PTE_BLOCK_INNER_SHARE -+ }, { -+ .virt = 0xfe000000UL, -+ .phys = 0xfe000000UL, -+ .size = 0x01800000UL, -+ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | -+ PTE_BLOCK_NON_SHARE | -+ PTE_BLOCK_PXN | PTE_BLOCK_UXN -+ }, { -+ /* List terminator */ -+ 0, -+ } -+}; -+#endif -+struct mm_region *mem_map = bcm283x_mem_map; - #endif - - int dram_init(void) --- -2.22.0 - diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-fw-utils_2019.07.bbappend b/meta-raspberrypi/recipes-bsp/u-boot/u-boot-fw-utils_2019.07.bbappend deleted file mode 100644 index 3daf157d7..000000000 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-fw-utils_2019.07.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# Apply the same patches for rpi4 as u-boot recipe -require u-boot-rpi4-${PV}.inc diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-rpi4-2019.07.inc b/meta-raspberrypi/recipes-bsp/u-boot/u-boot-rpi4-2019.07.inc deleted file mode 100644 index 2ce55a2b1..000000000 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-rpi4-2019.07.inc +++ /dev/null @@ -1,12 +0,0 @@ -FILESEXTRAPATHS_prepend_raspberrypi4 := "${THISDIR}/u-boot-2019.07:" -UBOOT_RPI4_SUPPORT_PATCHES = " \ - file://0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch \ - file://0002-ARM-bcm283x-Add-BCM283x_BASE-define.patch \ - file://0003-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch \ - file://0004-rpi-Add-entry-for-Raspberry-Pi-4-model-B.patch \ - file://0005-arm-bcm283x-Include-definition-for-additional-emmc-c.patch \ - file://0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch \ - file://0007-rpi-Add-memory-map-for-bcm2838.patch \ -" - -SRC_URI_append_raspberrypi4 = "${UBOOT_RPI4_SUPPORT_PATCHES}" diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2019.07.bbappend b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2019.07.bbappend deleted file mode 100644 index 3daf157d7..000000000 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2019.07.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# Apply the same patches for rpi4 as u-boot recipe -require u-boot-rpi4-${PV}.inc diff --git a/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb b/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb index 57400b1ce..852e3a604 100644 --- a/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb +++ b/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb @@ -11,7 +11,6 @@ OMXPLAYER = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'omxpl RDEPENDS_${PN} = "\ ${OMXPLAYER} \ bcm2835-tests \ - wiringpi \ rpio \ rpi-gpio \ pi-blaster \ diff --git a/meta-raspberrypi/recipes-devtools/wiringpi/wiringpi_git.bb b/meta-raspberrypi/recipes-devtools/wiringpi/wiringpi_git.bb deleted file mode 100644 index e78c58a29..000000000 --- a/meta-raspberrypi/recipes-devtools/wiringpi/wiringpi_git.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "A library to control Raspberry Pi GPIO channels" -HOMEPAGE = "https://projects.drogon.net/raspberry-pi/wiringpi/" -SECTION = "devel/libs" -LICENSE = "LGPLv3+" -LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02" - -DEPENDS += "virtual/crypt" - -# tag 2.46 -SRCREV = "8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a" - -S = "${WORKDIR}/git" - -SRC_URI = "git://git.drogon.net/wiringPi \ - file://0001-Add-initial-cross-compile-support.patch \ - " - -COMPATIBLE_MACHINE = "^rpi$" - -CFLAGS_prepend = "-I${S}/wiringPi -I${S}/devLib " - -EXTRA_OEMAKE += "'INCLUDE_DIR=${D}${includedir}' 'LIB_DIR=${D}${libdir}'" -EXTRA_OEMAKE += "'DESTDIR=${D}/usr' 'PREFIX=""'" - -do_compile() { - oe_runmake -C devLib - oe_runmake -C wiringPi - oe_runmake -C gpio 'LDFLAGS=${LDFLAGS} -L${S}/wiringPi -L${S}/devLib' -} - -do_install() { - oe_runmake -C devLib install - oe_runmake -C wiringPi install - oe_runmake -C gpio install -} diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-rt_4.19.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-rt_4.19.bb index 17791b091..7a9f083af 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-rt_4.19.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-rt_4.19.bb @@ -1,6 +1,6 @@ -LINUX_VERSION ?= "4.19.59" +LINUX_VERSION ?= "4.19.71" LINUX_RPI_BRANCH ?= "rpi-4.19.y-rt" -SRCREV = "1dae1f0521d69bfd22454180c40fe85fdd80ffc6" +SRCREV = "1532ea50263c8fd70f769b55e60fbc6a0c5778a0" require linux-raspberrypi_4.19.inc diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb index 900570de1..95407470e 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb @@ -1,6 +1,6 @@ -LINUX_VERSION ?= "4.19.71" +LINUX_VERSION ?= "4.19.75" LINUX_RPI_BRANCH ?= "rpi-4.19.y" -SRCREV = "13ce09db830e0c2fe524460b0673afb974359bc2" +SRCREV = "642e12d892e694214e387208ebd9feb4a654d287" require linux-raspberrypi_4.19.inc diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb index a09a9fcf0..3cc03213d 100644 --- a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb +++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb @@ -41,6 +41,7 @@ SRC_URI_append = "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " file S = "${WORKDIR}/git" COMPATIBLE_MACHINE = "^rpi$" +COMPATIBLE_HOST_aarch64 = "null" def cpu(d): for arg in (d.getVar('TUNE_CCARGS') or '').split(): diff --git a/meta-security/conf/layer.conf b/meta-security/conf/layer.conf index b9a4f254c..3e890e12e 100644 --- a/meta-security/conf/layer.conf +++ b/meta-security/conf/layer.conf @@ -9,6 +9,6 @@ BBFILE_COLLECTIONS += "security" BBFILE_PATTERN_security = "^${LAYERDIR}/" BBFILE_PRIORITY_security = "8" -LAYERSERIES_COMPAT_security = "warrior" +LAYERSERIES_COMPAT_security = "zeus" LAYERDEPENDS_security = "core openembedded-layer perl-layer networking-layer meta-python" diff --git a/meta-security/lib/oeqa/runtime/cases/checksec.py b/meta-security/lib/oeqa/runtime/cases/checksec.py index ff6d2f319..e46744c63 100644 --- a/meta-security/lib/oeqa/runtime/cases/checksec.py +++ b/meta-security/lib/oeqa/runtime/cases/checksec.py @@ -24,6 +24,7 @@ class CheckSecTest(OERuntimeTestCase): self.assertEqual(status, 0, msg = msg) @OETestDepends(['checksec.CheckSecTest.test_checksec_xml']) + @OEHasPackage(['binutils']) def test_checksec_fortify(self): status, output = self.target.run('checksec --fortify-proc 1') match = re.search('FORTIFY_SOURCE support:', output) diff --git a/meta-security/meta-integrity/conf/layer.conf b/meta-security/meta-integrity/conf/layer.conf index 41989da38..962424ccb 100644 --- a/meta-security/meta-integrity/conf/layer.conf +++ b/meta-security/meta-integrity/conf/layer.conf @@ -21,6 +21,6 @@ INTEGRITY_BASE := '${LAYERDIR}' # interactive shell is enough. OE_TERMINAL_EXPORTS += "INTEGRITY_BASE" -LAYERSERIES_COMPAT_integrity = "warrior" +LAYERSERIES_COMPAT_integrity = "zeus" # ima-evm-utils depends on keyutils from meta-oe LAYERDEPENDS_integrity = "core openembedded-layer" diff --git a/meta-security/meta-security-compliance/conf/layer.conf b/meta-security/meta-security-compliance/conf/layer.conf index 9ccadab8b..0e93bd0e8 100644 --- a/meta-security/meta-security-compliance/conf/layer.conf +++ b/meta-security/meta-security-compliance/conf/layer.conf @@ -8,6 +8,6 @@ BBFILE_COLLECTIONS += "scanners-layer" BBFILE_PATTERN_scanners-layer = "^${LAYERDIR}/" BBFILE_PRIORITY_scanners-layer = "10" -LAYERSERIES_COMPAT_scanners-layer = "warrior" +LAYERSERIES_COMPAT_scanners-layer = "zeus" LAYERDEPENDS_scanners-layer = "core openembedded-layer meta-python" diff --git a/meta-security/meta-tpm/conf/layer.conf b/meta-security/meta-tpm/conf/layer.conf index cdccc553e..3af2d9517 100644 --- a/meta-security/meta-tpm/conf/layer.conf +++ b/meta-security/meta-tpm/conf/layer.conf @@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "tpm-layer" BBFILE_PATTERN_tpm-layer = "^${LAYERDIR}/" BBFILE_PRIORITY_tpm-layer = "10" -LAYERSERIES_COMPAT_tpm-layer = "warrior" +LAYERSERIES_COMPAT_tpm-layer = "zeus" LAYERDEPENDS_tpm-layer = " \ core \ diff --git a/meta-security/recipes-ids/suricata/suricata_4.1.5.bb b/meta-security/recipes-ids/suricata/suricata_4.1.5.bb index cda1c870f..e15a9a337 100644 --- a/meta-security/recipes-ids/suricata/suricata_4.1.5.bb +++ b/meta-security/recipes-ids/suricata/suricata_4.1.5.bb @@ -52,9 +52,6 @@ do_install_append () { oe_runmake install-conf DESTDIR=${D} - # mimic move of downloaded rules to e_sysconfrulesdir - cp -rf ${WORKDIR}/rules ${D}${sysconfdir}/suricata - oe_runmake install-rules DESTDIR=${D} install -d ${D}${sysconfdir}/suricata ${D}${sysconfdir}/default/volatiles diff --git a/meta-security/recipes-mac/AppArmor/apparmor_2.13.3.bb b/meta-security/recipes-mac/AppArmor/apparmor_2.13.3.bb index 2e5d221c3..60d5e6880 100644 --- a/meta-security/recipes-mac/AppArmor/apparmor_2.13.3.bb +++ b/meta-security/recipes-mac/AppArmor/apparmor_2.13.3.bb @@ -32,16 +32,16 @@ PARALLEL_MAKE = "" inherit pkgconfig autotools-brokensep update-rc.d python3native perlnative ptest cpan manpages systemd -PACKAGECONFIG ??= "python perl" +PACKAGECONFIG ??= "python perl aa-decode" PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages" PACKAGECONFIG[python] = "--with-python, --without-python, python3 swig-native" PACKAGECONFIG[perl] = "--with-perl, --without-perl, perl perl-native swig-native" PACKAGECONFIG[apache2] = ",,apache2," +PACKAGECONFIG[aa-decode] = ",,,bash" PAMLIB="${@bb.utils.contains('DISTRO_FEATURES', 'pam', '1', '0', d)}" HTTPD="${@bb.utils.contains('PACKAGECONFIG', 'apache2', '1', '0', d)}" - python() { if 'apache2' in d.getVar('PACKAGECONFIG').split() and \ 'webserver' not in d.getVar('BBFILE_COLLECTIONS').split(): @@ -85,7 +85,6 @@ do_compile () { do_install () { install -d ${D}/${INIT_D_DIR} install -d ${D}/lib/apparmor - oe_runmake -C ${B}/libraries/libapparmor DESTDIR="${D}" install oe_runmake -C ${B}/binutils DESTDIR="${D}" install oe_runmake -C ${B}/utils DESTDIR="${D}" install @@ -97,6 +96,10 @@ do_install () { rm -f ${D}${sbindir}/aa-notify fi + if ! ${@bb.utils.contains('PACKAGECONFIG','aa-decode','true','false', d)}; then + rm -f ${D}${sbindir}/aa-decode + fi + if test -z "${HTTPD}" ; then oe_runmake -C ${B}/changehat/mod_apparmor DESTDIR="${D}" install fi @@ -111,8 +114,22 @@ do_install () { install ${WORKDIR}/apparmor ${D}/${INIT_D_DIR}/apparmor install ${WORKDIR}/functions ${D}/lib/apparmor - install -d ${D}${systemd_system_unitdir} - install ${WORKDIR}/apparmor.service ${D}${systemd_system_unitdir} + sed -i -e 's/getconf _NPROCESSORS_ONLN/nproc/' ${D}/lib/apparmor/functions + sed -i -e 's/ls -AU/ls -A/' ${D}/lib/apparmor/functions + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_system_unitdir} + install ${WORKDIR}/apparmor.service ${D}${systemd_system_unitdir} + fi +} + +#Building ptest on arm fails. +do_compile_ptest_aarch64 () { + : +} + +do_compile_ptest_arm () { + : } do_compile_ptest () { @@ -142,26 +159,39 @@ do_install_ptest () { cp -rf ${B}/binutils ${t} } +#Building ptest on arm fails. +do_install_ptest_aarch64 () { + : +} + +do_install_ptest_arm() { + : +} + pkg_postinst_ontarget_${PN} () { if [ ! -d /etc/apparmor.d/cache ] ; then mkdir /etc/apparmor.d/cache fi } +# We need the init script so don't rm it +RMINITDIR_class-target_remove = " rm_sysvinit_initddir" + INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME = "apparmor" INITSCRIPT_PARAMS = "start 16 2 3 4 5 . stop 35 0 1 6 ." SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "apparmor.service" -SYSTEMD_AUTO_ENABLE = "disable" +SYSTEMD_AUTO_ENABLE ?= "enable" PACKAGES += "mod-${PN}" FILES_${PN} += "/lib/apparmor/ ${sysconfdir}/apparmor ${PYTHON_SITEPACKAGES_DIR}" FILES_mod-${PN} = "${libdir}/apache2/modules/*" -RDEPENDS_${PN} += "bash" RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','python','python3-core python3-modules','', d)}" RDEPENDS_${PN}_remove += "${@bb.utils.contains('PACKAGECONFIG','perl','','perl', d)}" RDEPENDS_${PN}-ptest += "perl coreutils dbus-lib bash" + +PRIVATE_LIBS_${PN}-ptest = "libapparmor.so*" diff --git a/meta-security/recipes-security/checksec/checksec_2.1.0.bb b/meta-security/recipes-security/checksec/checksec_2.1.0.bb index 5c6528e48..b67c98bb6 100644 --- a/meta-security/recipes-security/checksec/checksec_2.1.0.bb +++ b/meta-security/recipes-security/checksec/checksec_2.1.0.bb @@ -16,4 +16,4 @@ do_install() { install -m 0755 ${S}/checksec ${D}${bindir} } -RDEPENDS_${PN} = "bash openssl-bin" +RDEPENDS_${PN} = "bash openssl-bin binutils" diff --git a/meta-x86/conf/layer.conf b/meta-x86/conf/layer.conf index 5812d5027..9be1a1fc0 100644 --- a/meta-x86/conf/layer.conf +++ b/meta-x86/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "obmc_machines_x86" BBFILE_PATTERN_obmc_machines_x86 = "" -LAYERSERIES_COMPAT_obmc_machines_x86 = "thud warrior" +LAYERSERIES_COMPAT_obmc_machines_x86 = "warrior zeus" diff --git a/meta-yadro/conf/layer.conf b/meta-yadro/conf/layer.conf index 58ac541cb..794ada888 100644 --- a/meta-yadro/conf/layer.conf +++ b/meta-yadro/conf/layer.conf @@ -5,4 +5,4 @@ BBFILE_COLLECTIONS += "yadro-layer" BBFILE_PATTERN_yadro-layer = "^${LAYERDIR}/" BBFILE_PATTERN_IGNORE_EMPTY_yadro-layer = "1" -LAYERSERIES_COMPAT_yadro-layer = "thud warrior" +LAYERSERIES_COMPAT_yadro-layer = "warrior zeus" diff --git a/meta-yadro/meta-nicole/conf/layer.conf b/meta-yadro/meta-nicole/conf/layer.conf index 85d0963da..c70d673a7 100644 --- a/meta-yadro/meta-nicole/conf/layer.conf +++ b/meta-yadro/meta-nicole/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "nicole-layer" BBFILE_PATTERN_nicole-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_nicole-layer = "thud warrior" +LAYERSERIES_COMPAT_nicole-layer = "warrior zeus" diff --git a/meta-yadro/meta-vesnin/conf/layer.conf b/meta-yadro/meta-vesnin/conf/layer.conf index c8e7890d8..75d9c0f69 100644 --- a/meta-yadro/meta-vesnin/conf/layer.conf +++ b/meta-yadro/meta-vesnin/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "vesnin-layer" BBFILE_PATTERN_vesnin-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_vesnin-layer = "thud warrior" +LAYERSERIES_COMPAT_vesnin-layer = "warrior zeus" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config/led.yaml b/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config/led.yaml index 3330e25ea..3dfc46193 100644 --- a/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config/led.yaml +++ b/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config/led.yaml @@ -7,6 +7,9 @@ BmcBooted: Action: 'On' Priority: 'Blink' PowerOn: + power_green: + Action: 'On' + Priority: 'On' PgoodTimeout: power_red: Action: 'On' diff --git a/poky/bitbake/bin/bitbake b/poky/bitbake/bin/bitbake index 778b1d69e..66d08f81a 100755 --- a/poky/bitbake/bin/bitbake +++ b/poky/bitbake/bin/bitbake @@ -26,7 +26,7 @@ from bb.main import bitbake_main, BitBakeConfigParameters, BBMainException if sys.getfilesystemencoding() != "utf-8": sys.exit("Please use a locale setting which supports UTF-8 (such as LANG=en_US.UTF-8).\nPython can't change the filesystem locale after loading so we need a UTF-8 when Python starts or things won't work.") -__version__ = "1.43.2" +__version__ = "1.44.0" if __name__ == "__main__": if __version__ != bb.__version__: diff --git a/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml index 02058a6f6..8f2a960ca 100644 --- a/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml +++ b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml @@ -791,7 +791,7 @@ The following statement in the <filename>local.conf</filename> file both enables BitBake to perform multiple configuration builds and - specifies the two multiconfigs: + specifies the two extra multiconfigs: <literallayout class='monospaced'> BBMULTICONFIG = "target1 target2" </literallayout> @@ -803,13 +803,13 @@ builds, use the following command form to start the builds: <literallayout class='monospaced'> - $ bitbake [multiconfig:<replaceable>multiconfigname</replaceable>:]<replaceable>target</replaceable> [[[multiconfig:<replaceable>multiconfigname</replaceable>:]<replaceable>target</replaceable>] ... ] + $ bitbake [mc:<replaceable>multiconfigname</replaceable>:]<replaceable>target</replaceable> [[[mc:<replaceable>multiconfigname</replaceable>:]<replaceable>target</replaceable>] ... ] </literallayout> - Here is an example for two multiconfigs: + Here is an example for two extra multiconfigs: <filename>target1</filename> and <filename>target2</filename>: <literallayout class='monospaced'> - $ bitbake multiconfig:target1:<replaceable>target</replaceable> multiconfig:target2:<replaceable>target</replaceable> + $ bitbake mc::<replaceable>target</replaceable> mc:target1:<replaceable>target</replaceable> mc:target2:<replaceable>target</replaceable> </literallayout> </para> </section> @@ -837,13 +837,13 @@ build, you must declare the dependencies in the recipe using the following statement form: <literallayout class='monospaced'> - <replaceable>task_or_package</replaceable>[mcdepends] = "multiconfig:<replaceable>from_multiconfig</replaceable>:<replaceable>to_multiconfig</replaceable>:<replaceable>recipe_name</replaceable>:<replaceable>task_on_which_to_depend</replaceable>" + <replaceable>task_or_package</replaceable>[mcdepends] = "mc:<replaceable>from_multiconfig</replaceable>:<replaceable>to_multiconfig</replaceable>:<replaceable>recipe_name</replaceable>:<replaceable>task_on_which_to_depend</replaceable>" </literallayout> To better show how to use this statement, consider an example with two multiconfigs: <filename>target1</filename> and <filename>target2</filename>: <literallayout class='monospaced'> - <replaceable>image_task</replaceable>[mcdepends] = "multiconfig:target1:target2:<replaceable>image2</replaceable>:<replaceable>rootfs_task</replaceable>" + <replaceable>image_task</replaceable>[mcdepends] = "mc:target1:target2:<replaceable>image2</replaceable>:<replaceable>rootfs_task</replaceable>" </literallayout> In this example, the <replaceable>from_multiconfig</replaceable> is "target1" and @@ -859,7 +859,7 @@ Once you set up this dependency, you can build the "target1" multiconfig using a BitBake command as follows: <literallayout class='monospaced'> - $ bitbake multiconfig:target1:<replaceable>image1</replaceable> + $ bitbake mc:target1:<replaceable>image1</replaceable> </literallayout> This command executes all the tasks needed to create <replaceable>image1</replaceable> for the "target1" @@ -875,7 +875,7 @@ Consider this change to the statement in the <replaceable>image1</replaceable> recipe: <literallayout class='monospaced'> - <replaceable>image_task</replaceable>[mcdepends] = "multiconfig:target1:target2:<replaceable>image2</replaceable>:<replaceable>image_task</replaceable>" + <replaceable>image_task</replaceable>[mcdepends] = "mc:target1:target2:<replaceable>image2</replaceable>:<replaceable>image_task</replaceable>" </literallayout> In this case, BitBake must create <replaceable>image2</replaceable> for the "target2" diff --git a/poky/bitbake/lib/bb/__init__.py b/poky/bitbake/lib/bb/__init__.py index f89969174..c144311be 100644 --- a/poky/bitbake/lib/bb/__init__.py +++ b/poky/bitbake/lib/bb/__init__.py @@ -9,7 +9,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -__version__ = "1.43.2" +__version__ = "1.44.0" import sys if sys.version_info < (3, 4, 0): diff --git a/poky/bitbake/lib/toaster/orm/fixtures/oe-core.xml b/poky/bitbake/lib/toaster/orm/fixtures/oe-core.xml index 9ae2e423e..a723f5a2a 100644 --- a/poky/bitbake/lib/toaster/orm/fixtures/oe-core.xml +++ b/poky/bitbake/lib/toaster/orm/fixtures/oe-core.xml @@ -23,9 +23,9 @@ <field type="CharField" name="branch">master</field> </object> <object model="orm.bitbakeversion" pk="4"> - <field type="CharField" name="name">thud</field> + <field type="CharField" name="name">zeus</field> <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> - <field type="CharField" name="branch">1.40</field> + <field type="CharField" name="branch">1.44</field> </object> <!-- Releases available --> @@ -51,11 +51,11 @@ <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/\">OpenEmbedded master</a> branch.</field> </object> <object model="orm.release" pk="4"> - <field type="CharField" name="name">thud</field> - <field type="CharField" name="description">Openembedded Thud</field> + <field type="CharField" name="name">zeus</field> + <field type="CharField" name="description">Openembedded Zeus</field> <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field> - <field type="CharField" name="branch_name">thud</field> - <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=thud\">OpenEmbedded Thud</a> branch.</field> + <field type="CharField" name="branch_name">zeus</field> + <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=zeus\">OpenEmbedded Zeus</a> branch.</field> </object> <!-- Default layers for each release --> diff --git a/poky/bitbake/lib/toaster/orm/fixtures/poky.xml b/poky/bitbake/lib/toaster/orm/fixtures/poky.xml index da3b93032..79923837f 100644 --- a/poky/bitbake/lib/toaster/orm/fixtures/poky.xml +++ b/poky/bitbake/lib/toaster/orm/fixtures/poky.xml @@ -26,9 +26,9 @@ <field type="CharField" name="dirpath">bitbake</field> </object> <object model="orm.bitbakeversion" pk="4"> - <field type="CharField" name="name">thud</field> + <field type="CharField" name="name">zeus</field> <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field> - <field type="CharField" name="branch">thud</field> + <field type="CharField" name="branch">zeus</field> <field type="CharField" name="dirpath">bitbake</field> </object> @@ -56,11 +56,11 @@ <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/">Yocto Project Master branch</a>.</field> </object> <object model="orm.release" pk="4"> - <field type="CharField" name="name">thud</field> - <field type="CharField" name="description">Yocto Project 2.6 "Thud"</field> + <field type="CharField" name="name">zeus</field> + <field type="CharField" name="description">Yocto Project 3.0 "Zeus"</field> <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field> - <field type="CharField" name="branch_name">thud</field> - <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=thud">Yocto Project Thud branch</a>.</field> + <field type="CharField" name="branch_name">zeus</field> + <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=zeus">Yocto Project Zeus branch</a>.</field> </object> <!-- Default project layers for each release --> @@ -152,7 +152,7 @@ <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> <field type="IntegerField" name="layer_source">0</field> <field rel="ManyToOneRel" to="orm.release" name="release">4</field> - <field type="CharField" name="branch">thud</field> + <field type="CharField" name="branch">zeus</field> <field type="CharField" name="dirpath">meta</field> </object> @@ -190,7 +190,7 @@ <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> <field type="IntegerField" name="layer_source">0</field> <field rel="ManyToOneRel" to="orm.release" name="release">4</field> - <field type="CharField" name="branch">thud</field> + <field type="CharField" name="branch">zeus</field> <field type="CharField" name="dirpath">meta-poky</field> </object> @@ -228,7 +228,7 @@ <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> <field type="IntegerField" name="layer_source">0</field> <field rel="ManyToOneRel" to="orm.release" name="release">4</field> - <field type="CharField" name="branch">thud</field> + <field type="CharField" name="branch">zeus</field> <field type="CharField" name="dirpath">meta-yocto-bsp</field> </object> </django-objects> diff --git a/poky/contrib/artwork/oe.svg b/poky/contrib/artwork/oe.svg new file mode 100644 index 000000000..a3545cb13 --- /dev/null +++ b/poky/contrib/artwork/oe.svg @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="209.104px" height="167.858px" viewBox="0 0 209.104 167.858" enable-background="new 0 0 209.104 167.858" + xml:space="preserve"> +<g> + <g> + <path fill="#00BCE4" d="M74.145,145.897c-0.568,0.568-0.841,1.228-0.841,2.03v0.339h5.744v-0.339c0-1.601-1.273-2.87-2.872-2.872 + C75.372,145.056,74.713,145.33,74.145,145.897z M73.304,154.262c0,0.876,0.729,1.605,1.605,1.605h6.334 + c1.357,0,2.195,0.838,2.195,2.194c0,1.357-0.838,2.195-2.195,2.195h-6.334c-1.657,0-3.101-0.58-4.265-1.73 + c-1.15-1.163-1.731-2.607-1.731-4.265v-6.334c0-4.041,3.221-7.261,7.262-7.263c2.019,0,3.752,0.705,5.148,2.115 + c1.41,1.396,2.114,3.13,2.114,5.147v4.729H73.304V154.262z"/> + <path fill="#00BCE4" d="M99.738,140.665c1.662,0,3.094,0.584,4.246,1.75c1.166,1.153,1.749,2.584,1.75,4.246v11.4 + c0,1.357-0.838,2.195-2.195,2.195s-2.195-0.838-2.195-2.195v-11.4c0-0.922-0.684-1.604-1.605-1.605h-1.604v13.006 + c0,1.357-0.838,2.195-2.195,2.195s-2.195-0.838-2.195-2.195v-13.006h-3.21v13.006c0,1.357-0.838,2.195-2.195,2.195 + s-2.195-0.838-2.195-2.195V142.86c0-1.357,0.838-2.195,2.195-2.195H99.738z"/> + <path fill="#00BCE4" d="M123.308,154.262c0,3.37-2.625,5.995-5.995,5.995h-6.334c-1.356,0-2.194-0.838-2.194-2.195V135.26 + c0-1.356,0.838-2.195,2.194-2.195c1.357,0,2.195,0.839,2.195,2.195v5.405h4.139c3.472,0,5.993,2.658,5.995,5.995V154.262z + M113.174,145.056v10.812h4.139c0.903,0,1.604-0.701,1.604-1.605v-7.601c0-0.927-0.678-1.604-1.605-1.605H113.174z"/> + <path fill="#00BCE4" d="M130.897,145.897c-0.568,0.568-0.842,1.228-0.842,2.03v0.339h5.744v-0.339c0-1.601-1.273-2.87-2.872-2.872 + C132.124,145.056,131.466,145.33,130.897,145.897z M130.056,154.262c0,0.876,0.729,1.605,1.605,1.605h6.334 + c1.357,0,2.195,0.838,2.195,2.194c0,1.357-0.838,2.195-2.195,2.195h-6.334c-1.657,0-3.102-0.58-4.266-1.73 + c-1.148-1.163-1.73-2.607-1.73-4.265v-6.334c0-4.041,3.221-7.261,7.263-7.263c2.019,0,3.752,0.705,5.147,2.115 + c1.41,1.396,2.115,3.13,2.115,5.147v4.729h-10.135V154.262z"/> + <path fill="#00BCE4" d="M143.688,143.646c1.129-1.972,2.906-2.98,5.201-2.981h4.139v-5.405c0-1.356,0.838-2.195,2.195-2.195 + s2.195,0.839,2.195,2.195v22.802c0,1.357-0.838,2.195-2.195,2.195h-6.334c-1.657,0-3.102-0.58-4.266-1.73 + c-1.149-1.163-1.73-2.607-1.73-4.265v-7.601C142.894,145.581,143.157,144.572,143.688,143.646z M147.741,145.532 + c-0.307,0.309-0.457,0.665-0.457,1.129v7.601c0,0.878,0.727,1.605,1.605,1.605h4.139v-10.812h-4.139 + C148.433,145.056,148.067,145.207,147.741,145.532z"/> + <path fill="#00BCE4" d="M160.917,143.646c1.129-1.972,2.905-2.98,5.201-2.981h4.139v-5.405c0-1.356,0.838-2.195,2.195-2.195 + c1.356,0,2.195,0.839,2.195,2.195v22.802c0,1.357-0.839,2.195-2.195,2.195h-6.334c-1.657,0-3.102-0.58-4.266-1.73 + c-1.149-1.163-1.73-2.607-1.73-4.265v-7.601C160.122,145.581,160.386,144.572,160.917,143.646z M164.97,145.532 + c-0.308,0.309-0.457,0.665-0.457,1.129v7.601c0,0.878,0.727,1.605,1.605,1.605h4.139v-10.812h-4.139 + C165.661,145.056,165.296,145.207,164.97,145.532z"/> + <path fill="#00BCE4" d="M182.583,145.897c-0.568,0.568-0.842,1.228-0.842,2.03v0.339h5.743l0.001-0.339 + c0-1.601-1.273-2.87-2.873-2.872C183.81,145.056,183.15,145.33,182.583,145.897z M181.741,154.262 + c0,0.876,0.729,1.605,1.605,1.605h6.333c1.357,0,2.195,0.838,2.195,2.194c0,1.357-0.838,2.195-2.195,2.195h-6.333 + c-1.658,0-3.102-0.58-4.266-1.73c-1.149-1.163-1.73-2.607-1.73-4.265v-6.334c0-4.041,3.221-7.261,7.262-7.263 + c2.019,0,3.752,0.705,5.148,2.115c1.41,1.396,2.114,3.13,2.114,5.147v4.729h-10.134V154.262z"/> + <path fill="#00BCE4" d="M195.374,143.646c1.129-1.972,2.905-2.98,5.2-2.981h4.139v-5.405c0-1.356,0.839-2.195,2.195-2.195 + c1.357,0,2.195,0.839,2.195,2.195v22.802c0,1.357-0.838,2.195-2.195,2.195h-6.333c-1.658,0-3.102-0.58-4.266-1.73 + c-1.149-1.163-1.73-2.607-1.73-4.265v-7.601C194.579,145.582,194.843,144.572,195.374,143.646z M199.427,145.532 + c-0.308,0.309-0.457,0.665-0.457,1.129v7.601c0,0.878,0.727,1.605,1.605,1.605h4.138v-10.812h-4.138 + C200.118,145.056,199.753,145.207,199.427,145.532z"/> + </g> + <g> + <path fill="#5C6F7B" d="M19.423,140.665h6.333c1.662,0,3.094,0.584,4.246,1.75c1.167,1.153,1.75,2.585,1.75,4.246v7.601 + c0,1.651-0.587,3.082-1.748,4.244c-1.152,1.167-2.586,1.751-4.248,1.751h-4.138v5.406c0,1.357-0.838,2.195-2.195,2.195 + s-2.195-0.839-2.195-2.195V142.86C17.228,141.503,18.066,140.665,19.423,140.665z M21.619,155.867h4.138 + c0.903,0,1.605-0.701,1.605-1.605v-7.601c0-0.928-0.679-1.604-1.605-1.605h-4.138V155.867z"/> + <path fill="#5C6F7B" d="M39.688,145.897c-0.569,0.568-0.841,1.228-0.841,2.03v0.339h5.743v-0.339c0-1.601-1.272-2.87-2.872-2.872 + C40.915,145.056,40.256,145.33,39.688,145.897z M38.847,154.262c0,0.876,0.729,1.605,1.605,1.605h6.333 + c1.357,0,2.195,0.838,2.195,2.194c0,1.357-0.838,2.195-2.195,2.195h-6.333c-1.657,0-3.101-0.58-4.265-1.73 + c-1.15-1.163-1.73-2.607-1.73-4.265v-6.334c0-4.041,3.22-7.261,7.262-7.263c2.018,0,3.752,0.705,5.147,2.115 + c1.411,1.396,2.115,3.13,2.115,5.147v4.729H38.847V154.262z"/> + <path fill="#5C6F7B" d="M51.685,142.86c0-1.357,0.838-2.195,2.195-2.195h6.334c1.662,0,3.094,0.584,4.246,1.75 + c1.167,1.153,1.749,2.584,1.75,4.246v11.4c0,1.357-0.838,2.195-2.195,2.195s-2.195-0.838-2.195-2.195v-11.4 + c0-0.922-0.684-1.604-1.605-1.605h-4.138v13.006c0,1.357-0.838,2.195-2.195,2.195c-1.357,0-2.195-0.838-2.195-2.195V142.86z"/> + <path fill-rule="evenodd" clip-rule="evenodd" fill="#5C6F7B" d="M10.134,147.928c0-1.601-1.273-2.87-2.872-2.872 + c-1.599,0-2.872,1.273-2.872,2.872v5.067c0,0.824,0.267,1.485,0.822,2.049c0.564,0.555,1.226,0.823,2.05,0.823 + c1.601,0,2.871-1.273,2.872-2.873V147.928z M0,147.928c0-4.041,3.22-7.261,7.262-7.263c2.019,0,3.752,0.705,5.148,2.115 + c1.411,1.396,2.114,3.13,2.114,5.147v5.067c0,4.041-3.222,7.262-7.262,7.262c-1.997,0-3.732-0.713-5.147-2.114 + C0.713,156.727,0,154.991,0,152.995V147.928z"/> + </g> + <g> + <path fill-rule="evenodd" clip-rule="evenodd" fill="#5C6F7B" d="M25.428,79.124C25.428,35.424,60.853,0,104.552,0 + s79.123,35.424,79.123,79.124c0,14.938-4.139,28.909-11.333,40.828h-26.366c10.352-10.5,16.738-24.918,16.738-40.828 + c0-32.123-26.039-58.163-58.162-58.163s-58.163,26.04-58.163,58.163c0,15.91,6.388,30.328,16.738,40.828H36.761 + C29.568,108.032,25.428,94.062,25.428,79.124z"/> + </g> + <g> + <path fill="#00BCE4" d="M94.122,79.124c0-2.882,1.168-5.491,3.059-7.379l17.436-17.494c-9.682-3.913-21.184-1.944-29.033,5.905 + c-10.476,10.476-10.476,27.461,0,37.937c10.476,10.477,27.461,10.477,37.938,0c4.547-4.547,7.12-10.321,7.721-16.256l18.46-18.461 + c5.838,16.774,2.056,36.151-11.345,49.553c-18.67,18.67-48.939,18.67-67.609,0c-18.67-18.67-18.67-48.938,0-67.608 + c18.669-18.67,48.939-18.67,67.609,0c2.535,2.536,4.728,5.287,6.574,8.193l-32.986,32.997c-1.888,1.89-4.511,3.045-7.393,3.045 + C98.791,89.554,94.122,84.884,94.122,79.124z"/> + </g> +</g> +</svg> diff --git a/poky/documentation/dev-manual/dev-manual-common-tasks.xml b/poky/documentation/dev-manual/dev-manual-common-tasks.xml index 165c3aa6a..f72f81f55 100644 --- a/poky/documentation/dev-manual/dev-manual-common-tasks.xml +++ b/poky/documentation/dev-manual/dev-manual-common-tasks.xml @@ -5420,26 +5420,34 @@ <literallayout class='monospaced'> BBMULTICONFIG = "x86 arm" </literallayout> + </para> + + <para>Please note, that a "default" configuration already exists by definition, + this configuration is named: "" (empty string) and is defined by the variables + coming from your local.conf file. So, the previous example actually adds two + additional configurations to your build "arm" and "x86" along with "". </para></listitem> <listitem><para> <emphasis>Launch BitBake</emphasis>: Use the following BitBake command form to launch the multiple configuration build: <literallayout class='monospaced'> - $ bitbake [multiconfig:<replaceable>multiconfigname</replaceable>:]<replaceable>target</replaceable> [[[multiconfig:<replaceable>multiconfigname</replaceable>:]<replaceable>target</replaceable>] ... ] + $ bitbake [mc:<replaceable>multiconfigname</replaceable>:]<replaceable>target</replaceable> [[[mc:<replaceable>multiconfigname</replaceable>:]<replaceable>target</replaceable>] ... ] </literallayout> For the example in this section, the following command applies: <literallayout class='monospaced'> - $ bitbake multiconfig:x86:core-image-minimal multiconfig:arm:core-image-sato + $ bitbake mc:x86:core-image-minimal mc:arm:core-image-sato mc::core-image-base </literallayout> The previous BitBake command builds a <filename>core-image-minimal</filename> image that is configured through the - <filename>x86.conf</filename> configuration file - and builds a <filename>core-image-sato</filename> + <filename>x86.conf</filename> configuration file, + a <filename>core-image-sato</filename> image that is configured through the - <filename>arm.conf</filename> configuration file. + <filename>arm.conf</filename> configuration file and a + <filename>core-image-base</filename> that is configured + through your <filename>local.conf</filename> configuration file. </para></listitem> </itemizedlist> <note> @@ -5479,7 +5487,7 @@ build, you must declare the dependencies in the recipe using the following statement form: <literallayout class='monospaced'> - <replaceable>task_or_package</replaceable>[mcdepends] = "multiconfig:<replaceable>from_multiconfig</replaceable>:<replaceable>to_multiconfig</replaceable>:<replaceable>recipe_name</replaceable>:<replaceable>task_on_which_to_depend</replaceable>" + <replaceable>task_or_package</replaceable>[mcdepends] = "mc:<replaceable>from_multiconfig</replaceable>:<replaceable>to_multiconfig</replaceable>:<replaceable>recipe_name</replaceable>:<replaceable>task_on_which_to_depend</replaceable>" </literallayout> To better show how to use this statement, consider the example scenario from the first paragraph of this section. @@ -5487,7 +5495,7 @@ that builds the <filename>core-image-sato</filename> image: <literallayout class='monospaced'> - do_image[mcdepends] = "multiconfig:x86:arm:core-image-minimal:do_rootfs" + do_image[mcdepends] = "mc:x86:arm:core-image-minimal:do_rootfs" </literallayout> In this example, the <replaceable>from_multiconfig</replaceable> is "x86". @@ -5502,7 +5510,7 @@ Once you set up this dependency, you can build the "x86" multiconfig using a BitBake command as follows: <literallayout class='monospaced'> - $ bitbake multiconfig:x86:core-image-sato + $ bitbake mc:x86:core-image-sato </literallayout> This command executes all the tasks needed to create the <filename>core-image-sato</filename> image for the @@ -5518,7 +5526,7 @@ Consider this change to the statement in the <filename>core-image-sato</filename> recipe: <literallayout class='monospaced'> - do_image[mcdepends] = "multiconfig:x86:arm:core-image-minimal:do_image" + do_image[mcdepends] = "mc:x86:arm:core-image-minimal:do_image" </literallayout> In this case, BitBake must create the <filename>core-image-minimal</filename> image for the diff --git a/poky/documentation/kernel-dev/kernel-dev-common.xml b/poky/documentation/kernel-dev/kernel-dev-common.xml index 7d8826fa3..2ea5d3f38 100644 --- a/poky/documentation/kernel-dev/kernel-dev-common.xml +++ b/poky/documentation/kernel-dev/kernel-dev-common.xml @@ -549,9 +549,9 @@ <literallayout class='monospaced'> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - SRC_URI_append += "file://<replaceable>patch-file-one</replaceable>" - SRC_URI_append += "file://<replaceable>patch-file-two</replaceable>" - SRC_URI_append += "file://<replaceable>patch-file-three</replaceable>" + SRC_URI_append = " file://<replaceable>patch-file-one</replaceable>" + SRC_URI_append = " file://<replaceable>patch-file-two</replaceable>" + SRC_URI_append = " file://<replaceable>patch-file-three</replaceable>" </literallayout> The <ulink url='&YOCTO_DOCS_REF_URL;#var-FILESEXTRAPATHS'><filename>FILESEXTRAPATHS</filename></ulink> diff --git a/poky/documentation/ref-manual/ref-system-requirements.xml b/poky/documentation/ref-manual/ref-system-requirements.xml index 51995309d..9c2198a76 100644 --- a/poky/documentation/ref-manual/ref-system-requirements.xml +++ b/poky/documentation/ref-manual/ref-system-requirements.xml @@ -89,65 +89,19 @@ </note> <itemizedlist> <listitem><para>Ubuntu 16.04 (LTS)</para></listitem> - <listitem><para>Ubuntu 18.04</para></listitem> + <listitem><para>Ubuntu 18.04 (LTS)</para></listitem> + <listitem><para>Ubuntu 19.04</para></listitem> <listitem><para>Fedora 28</para></listitem> <listitem><para>Fedora 29</para></listitem> + <listitem><para>Fedora 30</para></listitem> <listitem><para>CentOS 7.x</para></listitem> <listitem><para>Debian GNU/Linux 8.x (Jessie)</para></listitem> <listitem><para>Debian GNU/Linux 9.x (Stretch)</para></listitem> <listitem><para>Debian GNU/Linux 10.x (Buster)</para></listitem> - <listitem><para>OpenSUSE 42.3</para></listitem> + <listitem><para>OpenSUSE Leap 15.1</para></listitem> </itemizedlist> </para> - -<!-- <listitem><para>Ubuntu 10.04</para></listitem> - <listitem><para>Ubuntu 11.10</para></listitem> - <listitem><para>Ubuntu 12.04 (LTS)</para></listitem> - <listitem><para>Ubuntu 13.10</para></listitem> - <listitem><para>Ubuntu 14.04 (LTS)</para></listitem> - <listitem><para>Ubuntu 14.10</para></listitem> - <listitem><para>Ubuntu 15.04</para></listitem> - <listitem><para>Ubuntu 15.10</para></listitem> - <listitem><para>Ubuntu 16.04 (LTS)</para></listitem> - <listitem><para>Ubuntu 16.10 (LTS)</para></listitem> - <listitem><para>Ubuntu 17.04</para></listitem> - <listitem><para>Fedora 16 (Verne)</para></listitem> - <listitem><para>Fedora 17 (Spherical)</para></listitem> - <listitem><para>Fedora 19 (Schrödinger's Cat)</para></listitem> - <listitem><para>Fedora release 20 (Heisenbug)</para></listitem> - <listitem><para>Fedora release 22</para></listitem> - <listitem><para>Fedora release 23</para></listitem> - <listitem><para>Fedora release 24</para></listitem> - <listitem><para>Fedora release 26</para></listitem> - <listitem><para>CentOS release 5.6 (Final)</para></listitem> - <listitem><para>CentOS release 5.7 (Final)</para></listitem> - <listitem><para>CentOS release 5.8 (Final)</para></listitem> - <listitem><para>CentOS release 6.3 (Final)</para></listitem> - <listitem><para>CentOS release 6.x</para></listitem> - <listitem><para>CentOS release 7.x</para></listitem> - <listitem><para>Debian GNU/Linux 6.0 (Squeeze)</para></listitem> - <listitem><para>Debian GNU/Linux 7.x (Wheezy)</para></listitem> - <listitem><para>Debian GNU/Linux 8.x (Jessie)</para></listitem> - <listitem><para>Debian GNU/Linux 9.x (Stretch)</para></listitem> - <listitem><para>Debian GNU/Linux 7.1 (Wheezy)</para></listitem> - <listitem><para>Debian GNU/Linux 7.2 (Wheezy)</para></listitem> - <listitem><para>Debian GNU/Linux 7.3 (Wheezy)</para></listitem> - <listitem><para>Debian GNU/Linux 7.4 (Wheezy)</para></listitem> - <listitem><para>Debian GNU/Linux 7.5 (Wheezy)</para></listitem> - <listitem><para>Debian GNU/Linux 7.6 (Wheezy)</para></listitem> - <listitem><para>openSUSE 11.4</para></listitem> - <listitem><para>openSUSE 12.1</para></listitem> - <listitem><para>openSUSE 12.2</para></listitem> - <listitem><para>openSUSE 12.3</para></listitem> - <listitem><para>openSUSE 13.1</para></listitem> - <listitem><para>openSUSE 13.2</para></listitem> - <listitem><para>openSUSE 42.1</para></listitem> - <listitem><para>openSUSE 42.2</para></listitem> - </itemizedlist> ---> - - <note> While the Yocto Project Team attempts to ensure all Yocto Project releases are one hundred percent compatible with each officially diff --git a/poky/documentation/ref-manual/ref-variables.xml b/poky/documentation/ref-manual/ref-variables.xml index 93b758838..8ad3f9b3c 100644 --- a/poky/documentation/ref-manual/ref-variables.xml +++ b/poky/documentation/ref-manual/ref-variables.xml @@ -1344,12 +1344,12 @@ <glossentry id='var-BBMULTICONFIG'><glossterm>BBMULTICONFIG</glossterm> <info> - BBMULTICONFIG[doc] = "Specifies each separate configuration when you are building targets with multiple configurations." + BBMULTICONFIG[doc] = "Specifies each additional separate configuration when you are building targets with multiple configurations." </info> <glossdef> <para role="glossdeffirst"> <!-- <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> --> - Specifies each separate configuration when you are + Specifies each additional separate configuration when you are building targets with multiple configurations. Use this variable in your <filename>conf/local.conf</filename> configuration file. diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index f999992c9..619414295 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -1,7 +1,7 @@ DISTRO = "poky" DISTRO_NAME = "Poky (Yocto Project Reference Distro)" -DISTRO_VERSION = "2.7+snapshot-${DATE}" -DISTRO_CODENAME = "master" +DISTRO_VERSION = "3.0" +DISTRO_CODENAME = "zeus" SDK_VENDOR = "-pokysdk" SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}" @@ -50,10 +50,11 @@ p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ svn://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" SANITY_TESTED_DISTROS ?= " \ - poky-2.6 \n \ poky-2.7 \n \ + poky-3.0 \n \ ubuntu-16.04 \n \ ubuntu-18.04 \n \ + ubuntu-19.04 \n \ fedora-28 \n \ fedora-29 \n \ fedora-30 \n \ diff --git a/poky/meta-poky/conf/layer.conf b/poky/meta-poky/conf/layer.conf index 0d74f4eaa..a4b3d1e9d 100644 --- a/poky/meta-poky/conf/layer.conf +++ b/poky/meta-poky/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "yocto" BBFILE_PATTERN_yocto = "^${LAYERDIR}/" BBFILE_PRIORITY_yocto = "5" -LAYERSERIES_COMPAT_yocto = "warrior" +LAYERSERIES_COMPAT_yocto = "zeus" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/poky/meta-selftest/conf/layer.conf b/poky/meta-selftest/conf/layer.conf index 080350a56..08181a88c 100644 --- a/poky/meta-selftest/conf/layer.conf +++ b/poky/meta-selftest/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "selftest" BBFILE_PATTERN_selftest = "^${LAYERDIR}/" BBFILE_PRIORITY_selftest = "5" -LAYERSERIES_COMPAT_selftest = "warrior" +LAYERSERIES_COMPAT_selftest = "zeus" diff --git a/poky/meta-skeleton/conf/layer.conf b/poky/meta-skeleton/conf/layer.conf index 7d4ffb46e..7d7381a70 100644 --- a/poky/meta-skeleton/conf/layer.conf +++ b/poky/meta-skeleton/conf/layer.conf @@ -14,4 +14,4 @@ LAYERVERSION_skeleton = "1" LAYERDEPENDS_skeleton = "core" -LAYERSERIES_COMPAT_skeleton = "warrior" +LAYERSERIES_COMPAT_skeleton = "zeus" diff --git a/poky/meta-yocto-bsp/conf/layer.conf b/poky/meta-yocto-bsp/conf/layer.conf index 3c8f775bc..c94bb0031 100644 --- a/poky/meta-yocto-bsp/conf/layer.conf +++ b/poky/meta-yocto-bsp/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "yoctobsp" BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" BBFILE_PRIORITY_yoctobsp = "5" LAYERVERSION_yoctobsp = "4" -LAYERSERIES_COMPAT_yoctobsp = "warrior" +LAYERSERIES_COMPAT_yoctobsp = "zeus" diff --git a/poky/meta/classes/insane.bbclass b/poky/meta/classes/insane.bbclass index 9b886d138..9605ac2ba 100644 --- a/poky/meta/classes/insane.bbclass +++ b/poky/meta/classes/insane.bbclass @@ -34,7 +34,7 @@ ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ split-strip packages-list pkgv-undefined var-undefined \ version-going-backwards expanded-d invalid-chars \ license-checksum dev-elf file-rdeps configure-unsafe \ - configure-gettext \ + configure-gettext perllocalpod \ " # Add usrmerge QA check based on distro feature ERROR_QA_append = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', ' usrmerge', '', d)}" @@ -795,6 +795,23 @@ def package_qa_check_usrmerge(pkg, d, messages): return False return True +QAPKGTEST[perllocalpod] = "package_qa_check_perllocalpod" +def package_qa_check_perllocalpod(pkg, d, messages): + """ + Check that the recipe didn't ship a perlocal.pod file, which shouldn't be + installed in a distribution package. cpan.bbclass sets NO_PERLLOCAL=1 to + handle this for most recipes. + """ + import glob + pkgd = oe.path.join(d.getVar('PKGDEST'), pkg) + podpath = oe.path.join(pkgd, d.getVar("libdir"), "perl*", "*", "*", "perllocal.pod") + + matches = glob.glob(podpath) + if matches: + matches = [package_qa_clean_path(path, d, pkg) for path in matches] + msg = "%s contains perllocal.pod (%s), should not be installed" % (pkg, " ".join(matches)) + package_qa_add_message(messages, "perllocalpod", msg) + QAPKGTEST[expanded-d] = "package_qa_check_expanded_d" def package_qa_check_expanded_d(package, d, messages): """ diff --git a/poky/meta/classes/kernel-devicetree.bbclass b/poky/meta/classes/kernel-devicetree.bbclass index 867b776aa..8a81c850f 100644 --- a/poky/meta/classes/kernel-devicetree.bbclass +++ b/poky/meta/classes/kernel-devicetree.bbclass @@ -84,7 +84,7 @@ do_deploy_append() { ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then cat ${KERNEL_OUTPUT_DIR}/${type}.initramfs \ - ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext + ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \ > ${DEPLOYDIR}/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin ln -sf ${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \ ${DEPLOYDIR}/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin diff --git a/poky/meta/classes/license.bbclass b/poky/meta/classes/license.bbclass index adca881c8..648a4d789 100644 --- a/poky/meta/classes/license.bbclass +++ b/poky/meta/classes/license.bbclass @@ -287,17 +287,7 @@ def incompatible_license_contains(license, truevalue, falsevalue, d): bad_licenses = expand_wildcard_licenses(d, bad_licenses) return truevalue if license in bad_licenses else falsevalue -def incompatible_license(d, dont_want_licenses, package=None): - """ - This function checks if a recipe has only incompatible licenses. It also - take into consideration 'or' operand. dont_want_licenses should be passed - as canonical (SPDX) names. - """ - import oe.license - license = d.getVar("LICENSE_%s" % package) if package else None - if not license: - license = d.getVar('LICENSE') - +def incompatible_pkg_license(d, dont_want_licenses, license): # Handles an "or" or two license sets provided by # flattened_licenses(), pick one that works if possible. def choose_lic_set(a, b): @@ -311,6 +301,19 @@ def incompatible_license(d, dont_want_licenses, package=None): return any(not oe.license.license_ok(canonical_license(d, l), \ dont_want_licenses) for l in licenses) +def incompatible_license(d, dont_want_licenses, package=None): + """ + This function checks if a recipe has only incompatible licenses. It also + take into consideration 'or' operand. dont_want_licenses should be passed + as canonical (SPDX) names. + """ + import oe.license + license = d.getVar("LICENSE_%s" % package) if package else None + if not license: + license = d.getVar('LICENSE') + + return incompatible_pkg_license(d, dont_want_licenses, license) + def check_license_flags(d): """ This function checks if a recipe has any LICENSE_FLAGS that diff --git a/poky/meta/classes/license_image.bbclass b/poky/meta/classes/license_image.bbclass index 3f102d0fb..b5399b6d9 100644 --- a/poky/meta/classes/license_image.bbclass +++ b/poky/meta/classes/license_image.bbclass @@ -43,10 +43,16 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): bad_licenses = [canonical_license(d, l) for l in bad_licenses] bad_licenses = expand_wildcard_licenses(d, bad_licenses) + whitelist = [] + for lic in bad_licenses: + whitelist.extend((d.getVar("WHITELIST_" + lic) or "").split()) + with open(license_manifest, "w") as license_file: for pkg in sorted(pkg_dic): - if bad_licenses: + if bad_licenses and pkg not in whitelist: try: + if incompatible_pkg_license(d, bad_licenses, pkg_dic[pkg]["LICENSE"]): + bb.fatal("Package %s has an incompatible license %s and cannot be installed into the image." %(pkg, pkg_dic[pkg]["LICENSE"])) (pkg_dic[pkg]["LICENSE"], pkg_dic[pkg]["LICENSES"]) = \ oe.license.manifest_licenses(pkg_dic[pkg]["LICENSE"], bad_licenses, canonical_license, d) @@ -56,6 +62,8 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): pkg_dic[pkg]["LICENSES"] = re.sub(r'[|&()*]', ' ', pkg_dic[pkg]["LICENSE"]) pkg_dic[pkg]["LICENSES"] = re.sub(r' *', ' ', pkg_dic[pkg]["LICENSES"]) pkg_dic[pkg]["LICENSES"] = pkg_dic[pkg]["LICENSES"].split() + if pkg in whitelist: + bb.warn("Including %s with an incompatible license %s into the image, because it has been whitelisted." %(pkg, pkg_dic[pkg]["LICENSE"])) if not "IMAGE_MANIFEST" in pkg_dic[pkg]: # Rootfs manifest diff --git a/poky/meta/classes/systemd.bbclass b/poky/meta/classes/systemd.bbclass index 747055b8f..1dca09964 100644 --- a/poky/meta/classes/systemd.bbclass +++ b/poky/meta/classes/systemd.bbclass @@ -231,5 +231,6 @@ python rm_sysvinit_initddir (){ do_install[postfuncs] += "${RMINITDIR} " RMINITDIR_class-target = " rm_sysvinit_initddir rm_systemd_unitdir " +RMINITDIR_class-nativesdk = " rm_sysvinit_initddir rm_systemd_unitdir " RMINITDIR = "" diff --git a/poky/meta/classes/toolchain-scripts.bbclass b/poky/meta/classes/toolchain-scripts.bbclass index 1a2ec4f3b..db1d3215e 100644 --- a/poky/meta/classes/toolchain-scripts.bbclass +++ b/poky/meta/classes/toolchain-scripts.bbclass @@ -90,6 +90,7 @@ toolchain_shared_env_script () { echo 'export RANLIB=${TARGET_PREFIX}ranlib' >> $script echo 'export OBJCOPY=${TARGET_PREFIX}objcopy' >> $script echo 'export OBJDUMP=${TARGET_PREFIX}objdump' >> $script + echo 'export READELF=${TARGET_PREFIX}readelf' >> $script echo 'export AR=${TARGET_PREFIX}ar' >> $script echo 'export NM=${TARGET_PREFIX}nm' >> $script echo 'export M4=m4' >> $script diff --git a/poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc index ab0c6c554..d85e5b697 100644 --- a/poky/meta/conf/distro/include/maintainers.inc +++ b/poky/meta/conf/distro/include/maintainers.inc @@ -355,7 +355,7 @@ RECIPE_MAINTAINER_pn-libmatchbox = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-libmnl = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-libmodule-build-perl = "Tim Orling <timothy.t.orling@linux.intel.com>" -RECIPE_MAINTAINER_pn-libmodulemd = "Alexander Kanavin <alex.kanavin@gmail.com>" +RECIPE_MAINTAINER_pn-libmodulemd-v1 = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-libnl = "Alexander Kanavin <alex.kanavin@gmail.com>" diff --git a/poky/meta/conf/distro/include/tcmode-default.inc b/poky/meta/conf/distro/include/tcmode-default.inc index d8f434609..4a23c5063 100644 --- a/poky/meta/conf/distro/include/tcmode-default.inc +++ b/poky/meta/conf/distro/include/tcmode-default.inc @@ -26,7 +26,7 @@ QEMUVERSION ?= "4.1%" GOVERSION ?= "1.12%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump -LLVMVERSION ?= "8.0.1" +LLVMVERSION ?= "9.0.0" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" diff --git a/poky/meta/conf/distro/include/yocto-uninative.inc b/poky/meta/conf/distro/include/yocto-uninative.inc index df2434685..ad75d3e2a 100644 --- a/poky/meta/conf/distro/include/yocto-uninative.inc +++ b/poky/meta/conf/distro/include/yocto-uninative.inc @@ -6,9 +6,9 @@ # to the distro running on the build machine. # -UNINATIVE_MAXGLIBCVERSION = "2.29" +UNINATIVE_MAXGLIBCVERSION = "2.30" -UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/2.6/" -UNINATIVE_CHECKSUM[aarch64] ?= "a37118fc8b423f48146120707b81dd15017512c3e8ef9e6ca2cb3a033f4f4046" -UNINATIVE_CHECKSUM[i686] ?= "3234fc3ded810225071f23a0e9a99f4f8c2480059945a848eff076ce78122ade" -UNINATIVE_CHECKSUM[x86_64] ?= "133387753a9acf3e1b788103c59fac91e968e2ee331d7a4b9498e926ada7be57" +UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/2.7/" +UNINATIVE_CHECKSUM[aarch64] ?= "e76a45886ee8a0b3904b761c17ac8ff91edf9811ee455f1832d10763ba794dfc" +UNINATIVE_CHECKSUM[i686] ?= "810d027dfb1c7675226afbcec07808770516c969ee7378f6d8240281083f8924" +UNINATIVE_CHECKSUM[x86_64] ?= "9498d8bba047499999a7310ac2576d0796461184965351a56f6d32c888a1f216" diff --git a/poky/meta/conf/layer.conf b/poky/meta/conf/layer.conf index 95b1128ab..fcdf9ae5a 100644 --- a/poky/meta/conf/layer.conf +++ b/poky/meta/conf/layer.conf @@ -7,12 +7,12 @@ BBFILE_COLLECTIONS += "core" BBFILE_PATTERN_core = "^${LAYERDIR}/" BBFILE_PRIORITY_core = "5" -LAYERSERIES_CORENAMES = "warrior" +LAYERSERIES_CORENAMES = "zeus" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_core = "11" -LAYERSERIES_COMPAT_core = "warrior" +LAYERSERIES_COMPAT_core = "warrior zeus" BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core" diff --git a/poky/meta/lib/oe/terminal.py b/poky/meta/lib/oe/terminal.py index 9bda3efdc..a1daa2bed 100644 --- a/poky/meta/lib/oe/terminal.py +++ b/poky/meta/lib/oe/terminal.py @@ -55,7 +55,7 @@ class XTerminal(Terminal): raise UnsupportedTerminal(self.name) class Gnome(XTerminal): - command = 'gnome-terminal -t "{title}" -x {command}' + command = 'gnome-terminal -t "{title}" -- {command}' priority = 2 def __init__(self, sh_cmd, title=None, env=None, d=None): diff --git a/poky/meta/lib/oeqa/runtime/cases/dnf.py b/poky/meta/lib/oeqa/runtime/cases/dnf.py index 80cc86a4f..de3759995 100644 --- a/poky/meta/lib/oeqa/runtime/cases/dnf.py +++ b/poky/meta/lib/oeqa/runtime/cases/dnf.py @@ -117,6 +117,7 @@ class DnfRepoTest(DnfTest): @OETestDepends(['dnf.DnfRepoTest.test_dnf_makecache']) @skipIfInDataVar('DISTRO_FEATURES', 'usrmerge', 'Test run when not enable usrmerge') + @OEHasPackage('busybox') def test_dnf_installroot(self): rootpath = '/home/root/chroot/test' #Copy necessary files to avoid errors with not yet installed tools on @@ -143,6 +144,7 @@ class DnfRepoTest(DnfTest): @OETestDepends(['dnf.DnfRepoTest.test_dnf_makecache']) @skipIfNotInDataVar('DISTRO_FEATURES', 'usrmerge', 'Test run when enable usrmege') + @OEHasPackage('busybox') def test_dnf_installroot_usrmerge(self): rootpath = '/home/root/chroot/test' #Copy necessary files to avoid errors with not yet installed tools on diff --git a/poky/meta/lib/oeqa/sdk/cases/buildepoxy.py b/poky/meta/lib/oeqa/sdk/cases/buildepoxy.py index f3d207c6d..4211955f8 100644 --- a/poky/meta/lib/oeqa/sdk/cases/buildepoxy.py +++ b/poky/meta/lib/oeqa/sdk/cases/buildepoxy.py @@ -32,7 +32,9 @@ class EpoxyTest(OESDKTestCase): self.assertTrue(os.path.isdir(dirs["source"])) os.makedirs(dirs["build"]) - self._run("meson -Degl=no -Dglx=no -Dx11=false {build} {source}".format(**dirs)) + log = self._run("meson -Degl=no -Dglx=no -Dx11=false {build} {source}".format(**dirs)) + # Check that Meson thinks we're doing a cross build and not a native + self.assertIn("Build type: cross build", log) self._run("ninja -C {build} -v".format(**dirs)) self._run("DESTDIR={install} ninja -C {build} -v install".format(**dirs)) diff --git a/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py b/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py index 8213d63e3..cf2a42aab 100644 --- a/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py +++ b/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py @@ -161,8 +161,12 @@ class ImageFeatures(OESelftestTestCase): sysroot = get_bb_var('STAGING_DIR_NATIVE', 'core-image-minimal') result = runCmd('qemu-img info --output json %s' % image_path, native_sysroot=sysroot) - self.assertTrue(json.loads(result.output).get('format') == itype, - msg="Could not parse '%s'" % result.output) + try: + data = json.loads(result.output) + self.assertEqual(data.get('format'), itype, + msg="Unexpected format in '%s'" % (result.output)) + except json.decoder.JSONDecodeError: + self.fail("Could not parse '%ss'" % result.output) def test_long_chain_conversion(self): """ diff --git a/poky/meta/lib/oeqa/selftest/cases/incompatible_lic.py b/poky/meta/lib/oeqa/selftest/cases/incompatible_lic.py index 8fb93af8a..424a9e69c 100644 --- a/poky/meta/lib/oeqa/selftest/cases/incompatible_lic.py +++ b/poky/meta/lib/oeqa/selftest/cases/incompatible_lic.py @@ -39,3 +39,37 @@ class IncompatibleLicenseTests(OESelftestTestCase): # INCOMPATIBLE_LICENSE contains this license def test_incompatible_nonspdx_license(self): self.lic_test('incompatible-nonspdx-license', 'FooLicense', 'FooLicense') + +class IncompatibleLicensePerImageTests(OESelftestTestCase): + def default_config(self): + return """ +IMAGE_INSTALL_append = "bash" +INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0 LGPL-3.0" +""" + + def test_bash_default(self): + self.write_config(self.default_config()) + error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash has an incompatible license GPLv3+ and cannot be installed into the image." + + result = bitbake('core-image-minimal', ignore_status=True) + if error_msg not in result.output: + raise AssertionError(result.output) + + def test_bash_and_license(self): + self.write_config(self.default_config() + '\nLICENSE_append_pn-bash = " & SomeLicense"') + error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash has an incompatible license GPLv3+ & SomeLicense and cannot be installed into the image." + + result = bitbake('core-image-minimal', ignore_status=True) + if error_msg not in result.output: + raise AssertionError(result.output) + + def test_bash_or_license(self): + self.write_config(self.default_config() + '\nLICENSE_append_pn-bash = " | SomeLicense"') + + bitbake('core-image-minimal') + + def test_bash_whitelist(self): + self.write_config(self.default_config() + '\nWHITELIST_GPL-3.0_pn-core-image-minimal = "bash"') + + bitbake('core-image-minimal') + diff --git a/poky/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-3.0.9-fix-clang-build.patch b/poky/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-3.0.9-fix-clang-build.patch new file mode 100644 index 000000000..c6d660095 --- /dev/null +++ b/poky/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-3.0.9-fix-clang-build.patch @@ -0,0 +1,24 @@ +Fix building with CLANG-9.0.0 + +Fixes +clang-9: error: unknown argument: '-maccumulate-outgoing-args' + +Upstream-Status: Submitted [https://sourceforge.net/p/gnu-efi/patches/70/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/Make.defaults ++++ b/Make.defaults +@@ -110,10 +110,10 @@ + || ( [ $(GCCVERSION) -eq "4" ] \ + && [ $(GCCMINOR) -ge "7" ] ) ) \ + && echo 1) +- ifeq ($(GCCNEWENOUGH),1) +- CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11 +- else ifeq ($(USING_CLANG),clang) ++ ifeq ($(USING_CLANG),clang) + CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11 ++ else ifeq ($(GCCNEWENOUGH),1) ++ CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11 + endif + + CFLAGS += -mno-red-zone diff --git a/poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.9.bb b/poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.9.bb index f84443547..6d4c30335 100644 --- a/poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.9.bb +++ b/poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.9.bb @@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=16;md5=e582 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ file://parallel-make-archives.patch \ file://lib-Makefile-fix-parallel-issue.patch \ + file://gnu-efi-3.0.9-fix-clang-build.patch \ " SRC_URI[md5sum] = "32af17b917545a693e549af2439c4a99" diff --git a/poky/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb b/poky/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb index 69b117407..f4e985036 100644 --- a/poky/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb +++ b/poky/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb @@ -133,7 +133,5 @@ PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3- FILES_python3-bind = "${sbindir}/dnssec-coverage ${sbindir}/dnssec-checkds \ ${sbindir}/dnssec-keymgr ${PYTHON_SITEPACKAGES_DIR}" -RDEPENDS_${PN} = "bash" -RDEPENDS_${PN}-utils = "bash" RDEPENDS_${PN}-dev = "" RDEPENDS_python3-bind = "python3-core python3-ply" diff --git a/poky/meta/recipes-connectivity/bluez5/bluez5.inc b/poky/meta/recipes-connectivity/bluez5/bluez5.inc index 6c79ed060..f582a07e2 100644 --- a/poky/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/poky/meta/recipes-connectivity/bluez5/bluez5.inc @@ -155,3 +155,5 @@ do_install_ptest() { cp -r ${B}/unit/ ${D}${PTEST_PATH} rm -f ${D}${PTEST_PATH}/unit/*.o } + +RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-utf-16" diff --git a/poky/meta/recipes-connectivity/iproute2/iproute2.inc b/poky/meta/recipes-connectivity/iproute2/iproute2.inc index d72871767..fc31b8444 100644 --- a/poky/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/poky/meta/recipes-connectivity/iproute2/iproute2.inc @@ -9,14 +9,15 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://ip/ip.c;beginline=3;endline=8;md5=689d691d0410a4b64d3899f8d6e31817" -DEPENDS = "flex-native bison-native iptables elfutils libcap" +DEPENDS = "flex-native bison-native iptables libcap" inherit update-alternatives bash-completion pkgconfig CLEANBROKEN = "1" -PACKAGECONFIG ??= "tipc" +PACKAGECONFIG ??= "tipc elf" PACKAGECONFIG[tipc] = ",,libmnl," +PACKAGECONFIG[elf] = ",,elfutils," EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" diff --git a/poky/meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch b/poky/meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch deleted file mode 100644 index 01773834c..000000000 --- a/poky/meta/recipes-connectivity/libpcap/libpcap/0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch +++ /dev/null @@ -1,29 +0,0 @@ -From aafa3512b7b742f5e66a5543e41974cc5e7eebfa Mon Sep 17 00:00:00 2001 -From: maxice8 <thinkabit.ukim@gmail.com> -Date: Sun, 22 Jul 2018 18:54:17 -0300 -Subject: [PATCH] pcap-usb-linux.c: add missing limits.h for musl systems. - -fix compilation on musl libc systems like Void Linux and Alpine. - -Upstream-Status: Backport [https://github.com/the-tcpdump-group/libpcap/commit/d557c98a16dc254aaff03762b694fe624e180bea] - -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - pcap-usb-linux.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c -index 6f8adf65..b92c05ea 100644 ---- a/pcap-usb-linux.c -+++ b/pcap-usb-linux.c -@@ -50,6 +50,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <fcntl.h> -+#include <limits.h> - #include <string.h> - #include <dirent.h> - #include <byteswap.h> --- -2.17.1 - diff --git a/poky/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb b/poky/meta/recipes-connectivity/libpcap/libpcap_1.9.1.bb index 77bc31af7..35bb5650b 100644 --- a/poky/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb +++ b/poky/meta/recipes-connectivity/libpcap/libpcap_1.9.1.bb @@ -5,16 +5,15 @@ security monitoring and network debugging." HOMEPAGE = "http://www.tcpdump.org/" BUGTRACKER = "http://sourceforge.net/tracker/?group_id=53067&atid=469577" SECTION = "libs/network" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453 \ file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2" DEPENDS = "flex-native bison-native" SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz \ - file://0001-pcap-usb-linux.c-add-missing-limits.h-for-musl-syste.patch \ " -SRC_URI[md5sum] = "dffd65cb14406ab9841f421732eb0f33" -SRC_URI[sha256sum] = "2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019" +SRC_URI[md5sum] = "21af603d9a591c7d96a6457021d84e6c" +SRC_URI[sha256sum] = "635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094" inherit autotools binconfig-disabled pkgconfig diff --git a/poky/meta/recipes-connectivity/socat/socat_1.7.3.3.bb b/poky/meta/recipes-connectivity/socat/socat_1.7.3.3.bb index 067f7c644..1dbbe5cd5 100644 --- a/poky/meta/recipes-connectivity/socat/socat_1.7.3.3.bb +++ b/poky/meta/recipes-connectivity/socat/socat_1.7.3.3.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.dest-unreach.org/socat/" SECTION = "console/network" -DEPENDS = "openssl readline" +DEPENDS = "openssl" LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ @@ -39,9 +39,10 @@ TERMBITS_SHIFTS_powerpc64 = "sc_cv_sys_crdly_shift=12 \ sc_cv_sys_tabdly_shift=10 \ sc_cv_sys_csize_shift=8" -PACKAGECONFIG_class-target ??= "tcp-wrappers" -PACKAGECONFIG ??= "" +PACKAGECONFIG_class-target ??= "tcp-wrappers readline" +PACKAGECONFIG ??= "readline" PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" +PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" do_install_prepend () { mkdir -p ${D}${bindir} diff --git a/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb b/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb index c16978cfe..ad9e6ea4b 100644 --- a/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb +++ b/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb @@ -2,7 +2,7 @@ SUMMARY = "Client for Wi-Fi Protected Access (WPA)" HOMEPAGE = "http://w1.fi/wpa_supplicant/" BUGTRACKER = "http://w1.fi/security/" SECTION = "network" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=279b4f5abb9c153c285221855ddb78cc \ file://README;beginline=1;endline=56;md5=e7d3dbb01f75f0b9799e192731d1e1ff \ file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=0a8b56d3543498b742b9c0e94cc2d18b" diff --git a/poky/meta/recipes-core/dbus/dbus_1.12.16.bb b/poky/meta/recipes-core/dbus/dbus_1.12.16.bb index 05716608b..f4fec2365 100644 --- a/poky/meta/recipes-core/dbus/dbus_1.12.16.bb +++ b/poky/meta/recipes-core/dbus/dbus_1.12.16.bb @@ -92,11 +92,13 @@ pkg_postinst_dbus() { fi } + EXTRA_OECONF = "--disable-tests \ --disable-xml-docs \ --disable-doxygen-docs \ --disable-libaudit \ --enable-largefile \ + --with-system-socket=/run/dbus/system_bus_socket \ " EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl" diff --git a/poky/meta/recipes-core/expat/expat_2.2.8.bb b/poky/meta/recipes-core/expat/expat_2.2.9.bb index 0ea2edc12..8f3db4135 100644 --- a/poky/meta/recipes-core/expat/expat_2.2.8.bb +++ b/poky/meta/recipes-core/expat/expat_2.2.9.bb @@ -10,8 +10,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ file://libtool-tag.patch \ " -SRC_URI[md5sum] = "00858041acfea5757af55e6ee6b86231" -SRC_URI[sha256sum] = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102" +SRC_URI[md5sum] = "875a2c2ff3e8eb9e5a5cd62db2033ab5" +SRC_URI[sha256sum] = "f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237" inherit autotools lib_package diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch index ede29c90b..edac4c9f7 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001 +From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 15 Feb 2019 11:17:27 +0100 Subject: [PATCH] Do not write $bindir into pkg-config files @@ -9,33 +9,44 @@ rather than use target paths). Upstream-Status: Inappropriate [upstream wants the paths in .pc files] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- - gio/meson.build | 6 +++--- - glib/meson.build | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) + gio/meson.build | 16 ++++++++-------- + glib/meson.build | 6 +++--- + 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gio/meson.build b/gio/meson.build -index 85d8b14..657720a 100644 +index 71e88c4..8ce3987 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio, +@@ -831,14 +831,14 @@ pkg.generate(libgio, 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), 'giomoduledir=' + giomodulesdir, +- 'gio=' + join_paths('${bindir}', 'gio'), +- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), - 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), - 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), -- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')], +- 'gdbus=' + join_paths('${bindir}', 'gdbus'), +- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'), +- 'gresource=' + join_paths('${bindir}', 'gresource'), +- 'gsettings=' + join_paths('${bindir}', 'gsettings')], ++ 'gio=gio', ++ 'gio_querymodules=gio-querymodules', + 'glib_compile_schemas=glib-compile-schemas', + 'glib_compile_resources=glib-compile-resources', -+ 'gdbus_codegen=gdbus-codegen'], ++ 'gdbus=gdbus', ++ 'gdbus_codegen=gdbus-codegen', ++ 'gresource=gresource', ++ 'gsettings=gsettings'], version : glib_version, install_dir : glib_pkgconfigreldir, filebase : 'gio-2.0', diff --git a/glib/meson.build b/glib/meson.build -index c05c694..434e8b1 100644 +index 91a48f1..978fb73 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl], +@@ -375,9 +375,9 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch new file mode 100644 index 000000000..d8cf269bb --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch @@ -0,0 +1,34 @@ +From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 15 Mar 2014 22:42:29 -0700 +Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux + +translation files are always installed under PREFIX/share/locale in uclibc +based systems therefore lets set DATADIRNAME to "share". + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +%% original patch: uclibc_musl_translation.patch +--- + m4macros/glib-gettext.m4 | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4 +index df6fbf0..47db864 100644 +--- a/m4macros/glib-gettext.m4 ++++ b/m4macros/glib-gettext.m4 +@@ -293,6 +293,10 @@ msgstr "" + CATOBJEXT=.mo + DATADIRNAME=share + ;; ++ *-*-musl* | *-*-linux-uclibc*) ++ CATOBJEXT=.gmo ++ DATADIRNAME=share ++ ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib +-- +2.17.1 + diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch index d22a646c5..b02169e09 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch @@ -1,4 +1,4 @@ -From f5a4b4c0579734923c9caf70944322efff57318b Mon Sep 17 00:00:00 2001 +From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 13 Feb 2019 15:32:05 +0100 Subject: [PATCH] Set host_machine correctly when building with mingw32 @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index 028b196..217ccb1 100644 +index 95aafc1..9025eb2 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -12,7 +12,7 @@ test_c_args = [ - '-DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()), +@@ -13,7 +13,7 @@ test_c_args = [ + '-UG_DISABLE_ASSERT', ] -if host_machine.system() == 'windows' @@ -26,7 +26,7 @@ index 028b196..217ccb1 100644 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] endif -@@ -119,7 +119,7 @@ if dbus1_dep.found() +@@ -120,7 +120,7 @@ if dbus1_dep.found() endif # Test programs buildable on UNIX only @@ -35,7 +35,7 @@ index 028b196..217ccb1 100644 gio_tests += { 'file' : {}, 'gdbus-peer' : { -@@ -327,7 +327,7 @@ if host_machine.system() != 'windows' +@@ -332,7 +332,7 @@ if host_machine.system() != 'windows' endif # unix # Test programs buildable on Windows only @@ -44,7 +44,7 @@ index 028b196..217ccb1 100644 gio_tests += {'win32-streams' : {}} endif -@@ -392,7 +392,7 @@ if cc.get_id() != 'msvc' +@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' } endif @@ -54,7 +54,7 @@ index 028b196..217ccb1 100644 'gdbus-example-unix-fd-client' : { 'install' : false, diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index d54fc41..a4761fe 100644 +index c47133f..cad975f 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build @@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD') @@ -67,10 +67,10 @@ index d54fc41..a4761fe 100644 glib_tests += { 'gpoll' : { diff --git a/meson.build b/meson.build -index a745024..e87eae5 100644 +index 717d1bc..2a3beb8 100644 --- a/meson.build +++ b/meson.build -@@ -31,6 +31,9 @@ else +@@ -32,6 +32,9 @@ else endif host_system = host_machine.system() @@ -81,7 +81,7 @@ index a745024..e87eae5 100644 glib_version = meson.project_version() glib_api_version = '2.0' diff --git a/tests/meson.build b/tests/meson.build -index 11075dd..cd6067b 100644 +index ce30442..5710f2c 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -66,7 +66,7 @@ test_extra_programs = { diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch new file mode 100644 index 000000000..833ad2540 --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch @@ -0,0 +1,31 @@ +From cce617bec254e327ed7bcad60f58208024c6dc42 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 12 Oct 2019 17:46:26 -0700 +Subject: [PATCH] meson: Run atomics test on clang as well + +Fixes +./glib-2.62.1/glib/gatomic.c:675:2: error: G_ATOMIC_LOCK_FREE defined, but incapable of lock-free atomics. +^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9731de4..c678931 100644 +--- a/meson.build ++++ b/meson.build +@@ -1634,7 +1634,7 @@ atomicdefine = ''' + # We know that we can always use real ("lock free") atomic operations with MSVC + if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') + have_atomic_lock_free = true +- if cc.get_id() == 'gcc' and not cc.compiles(atomicdefine, name : 'atomic ops define') ++ if (cc.get_id() == 'gcc' or cc.get_id() == 'clang') and not cc.compiles(atomicdefine, name : 'atomic ops define') + # Old gcc release may provide + # __sync_bool_compare_and_swap but doesn't define + # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 +-- +2.23.0 + diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch deleted file mode 100644 index d1ed02875..000000000 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch +++ /dev/null @@ -1,62 +0,0 @@ -Upstream-Status: Backport [fc88e56bfc2b09a8fb2b350e76f6425ab0a056d7] -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 141acf6a2f3b21d63c9cfe620b8e20a506e78493 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Wed, 13 Mar 2019 16:22:09 +0000 -Subject: [PATCH] meson: do a build-time check for strlcpy before attempting - runtime check - -In cross-compilation environments the runtime check isn't possible so it is up -to the builder to seed the cross file, but we can definitely state that strlcpy -doesn't exist with a build test. ---- - meson.build | 30 ++++++++++++++++-------------- - 1 file changed, 16 insertions(+), 14 deletions(-) - -diff --git a/meson.build b/meson.build -index 15039e448..414f2d9b1 100644 ---- a/meson.build -+++ b/meson.build -@@ -1860,22 +1860,24 @@ endif - - # Test if we have strlcpy/strlcat with a compatible implementation: - # https://bugzilla.gnome.org/show_bug.cgi?id=53933 --if cc_can_run -- rres = cc.run('''#include <stdlib.h> -- #include <string.h> -- int main() { -- char p[10]; -- (void) strlcpy (p, "hi", 10); -- if (strlcat (p, "bye", 0) != 3) -- return 1; -- return 0; -- }''', -- name : 'OpenBSD strlcpy/strlcat') -- if rres.compiled() and rres.returncode() == 0 -+if cc.has_function('strlcpy') -+ if cc_can_run -+ rres = cc.run('''#include <stdlib.h> -+ #include <string.h> -+ int main() { -+ char p[10]; -+ (void) strlcpy (p, "hi", 10); -+ if (strlcat (p, "bye", 0) != 3) -+ return 1; -+ return 0; -+ }''', -+ name : 'OpenBSD strlcpy/strlcat') -+ if rres.compiled() and rres.returncode() == 0 -+ glib_conf.set('HAVE_STRLCPY', 1) -+ endif -+ elif meson.get_cross_property('have_strlcpy', false) - glib_conf.set('HAVE_STRLCPY', 1) - endif --elif meson.get_cross_property('have_strlcpy', false) -- glib_conf.set('HAVE_STRLCPY', 1) - endif - - python = import('python').find_installation('python3') --- -2.11.0 - diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch deleted file mode 100644 index 5a1a58989..000000000 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 635fe26af51f20194c8b208e7d01303be1086d68 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 19 Feb 2019 10:31:11 +0100 -Subject: [PATCH] meson.build: do not hardcode 'linux' as the host system - -OE build system can set this to other values that include 'linux', -e.g. 'linux-gnueabi' - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 4348f20..af5ed63 100644 ---- a/meson.build -+++ b/meson.build -@@ -1574,7 +1574,7 @@ atomicdefine = ''' - # We know that we can always use real ("lock free") atomic operations with MSVC - if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops') - have_atomic_lock_free = true -- if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic ops define') -+ if (host_system == 'android' or host_system.contains('linux')) and not cc.compiles(atomicdefine, name : 'atomic ops define') - # When building for armv5 on Linux, gcc provides - # __sync_bool_compare_and_swap but doesn't define - # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index 380bee086..7e9925845 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,4 +1,4 @@ -From 9c5d6e6ce5254a5f050bba2118a4a1807292c02a Mon Sep 17 00:00:00 2001 +From 6325bf4e8a2f569c55c8e1a36b9439d3566f98f6 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds @@ -19,10 +19,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gio/giomodule.c b/gio/giomodule.c -index b92162d..fce9933 100644 +index 1007abd..5380982 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c -@@ -40,6 +40,8 @@ +@@ -44,6 +44,8 @@ #include "gnetworkmonitor.h" #ifdef G_OS_WIN32 #include "gregistrysettingsbackend.h" @@ -31,7 +31,7 @@ index b92162d..fce9933 100644 #endif #include <glib/gstdio.h> -@@ -1156,7 +1158,15 @@ get_gio_module_dir (void) +@@ -1158,7 +1160,15 @@ get_gio_module_dir (void) #endif g_free (install_dir); #else diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch deleted file mode 100644 index 7aa6217d6..000000000 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix DATADIRNAME on uclibc/Linux - -translation files are always installed under PREFIX/share/locale in uclibc -based systems therefore lets set DATADIRNAME to "share". - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending -Index: glib-2.46.1/m4macros/glib-gettext.m4 -=================================================================== ---- glib-2.46.1.orig/m4macros/glib-gettext.m4 -+++ glib-2.46.1/m4macros/glib-gettext.m4 -@@ -243,6 +243,10 @@ msgstr "" - CATOBJEXT=.mo - DATADIRNAME=share - ;; -+ *-*-musl* | *-*-linux-uclibc*) -+ CATOBJEXT=.gmo -+ DATADIRNAME=share -+ ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb index 740473719..7897170a7 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb @@ -6,7 +6,7 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://run-ptest \ - file://uclibc_musl_translation.patch \ + file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \ file://Enable-more-tests-while-cross-compiling.patch \ file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ @@ -14,12 +14,11 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \ file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ - file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \ - file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \ + file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch" SRC_URI_append_class-target = " file://glib-meson.cross" -SRC_URI[md5sum] = "f036f78a7fca330d9f7d939fcf794bde" -SRC_URI[sha256sum] = "8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310" +SRC_URI[md5sum] = "64c14b4fe46c478992560c2f48a5b649" +SRC_URI[sha256sum] = "3dd9024e1d0872a6da7ac509937ccf997161b11d7d35be337c7e829cbae0f9df" diff --git a/poky/meta/recipes-core/glib-2.0/glib.inc b/poky/meta/recipes-core/glib-2.0/glib.inc index 3ae22f5e8..8b95f2120 100644 --- a/poky/meta/recipes-core/glib-2.0/glib.inc +++ b/poky/meta/recipes-core/glib-2.0/glib.inc @@ -158,6 +158,8 @@ RDEPENDS_${PN}-ptest += "\ ${PN}-locale-pl \ ${PN}-locale-ru \ ${PN}-locale-th \ + python3-core \ + python3-modules \ " RDEPENDS_${PN}-ptest_append_libc-glibc = "\ diff --git a/poky/meta/recipes-core/glib-networking/glib-networking_2.60.3.bb b/poky/meta/recipes-core/glib-networking/glib-networking_2.62.1.bb index 0278ab2fb..81d3fd43d 100644 --- a/poky/meta/recipes-core/glib-networking/glib-networking_2.60.3.bb +++ b/poky/meta/recipes-core/glib-networking/glib-networking_2.62.1.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" DEPENDS = "glib-2.0" -SRC_URI[archive.md5sum] = "e8fd0462a82269fb4bbd6c07a1e7d0f4" -SRC_URI[archive.sha256sum] = "d50183046a4ff955d8cc7e953067cdfc94f14dbfda3024bf377ff37a3121dcd5" +SRC_URI[archive.md5sum] = "64ca1e1e43e623b916059585bf7e4758" +SRC_URI[archive.sha256sum] = "3c55ae6771ad7a79fa606a834f4686ed555c2774ed6e9ece6f3c0f6a3dab7110" PACKAGECONFIG ??= "gnutls" diff --git a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 3f0a54cee..1d74ee519 100644 --- a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -24,7 +24,7 @@ IMAGE_FSTYPES = "wic.vmdk" inherit core-image module-base setuptools3 -SRCREV ?= "d230765d1fa7119d1de0ab7f116e895202e898e3" +SRCREV ?= "8181681b33da272fef83276104d5c7a93f84da46" SRC_URI = "git://git.yoctoproject.org/poky \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ diff --git a/poky/meta/recipes-core/musl/musl/0001-Change-container-for-riscv-floating-point-state-to-_.patch b/poky/meta/recipes-core/musl/musl/0001-Change-container-for-riscv-floating-point-state-to-_.patch deleted file mode 100644 index a9abb1872..000000000 --- a/poky/meta/recipes-core/musl/musl/0001-Change-container-for-riscv-floating-point-state-to-_.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 52a37610650e7366a398dd07393d3902d2f3faa3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 28 Sep 2019 12:19:57 -0700 -Subject: [PATCH] Change container for riscv floating-point state to __riscv_mc_fp_state - -Match the struct elements with glibc -glibc also uses __riscv_mc prefix, some packages like gdb uses that - -Upstream-Status: Submitted [https://www.openwall.com/lists/musl/2019/09/28/1] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - arch/riscv64/bits/signal.h | 18 +++++++++--------- - arch/riscv64/bits/user.h | 2 +- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/arch/riscv64/bits/signal.h b/arch/riscv64/bits/signal.h -index 76d7ad80..aba7ab00 100644 ---- a/arch/riscv64/bits/signal.h -+++ b/arch/riscv64/bits/signal.h -@@ -13,25 +13,25 @@ typedef unsigned long greg_t; - typedef unsigned long gregset_t[32]; - - struct __riscv_mc_f_ext_state { -- unsigned int f[32]; -- unsigned int fcsr; -+ unsigned int __f[32]; -+ unsigned int __fcsr; - }; - - struct __riscv_mc_d_ext_state { -- unsigned long long f[32]; -- unsigned int fcsr; -+ unsigned long long __f[32]; -+ unsigned int __fcsr; - }; - - struct __riscv_mc_q_ext_state { -- unsigned long long f[64] __attribute__((aligned(16))); -- unsigned int fcsr; -+ unsigned long long __f[64] __attribute__((aligned(16))); -+ unsigned int __fcsr; - unsigned int reserved[3]; - }; - - union __riscv_mc_fp_state { -- struct __riscv_mc_f_ext_state f; -- struct __riscv_mc_d_ext_state d; -- struct __riscv_mc_q_ext_state q; -+ struct __riscv_mc_f_ext_state __f; -+ struct __riscv_mc_d_ext_state __d; -+ struct __riscv_mc_q_ext_state __q; - }; - - typedef union __riscv_mc_fp_state fpregset_t; -diff --git a/arch/riscv64/bits/user.h b/arch/riscv64/bits/user.h -index d2e383b2..9918a2fe 100644 ---- a/arch/riscv64/bits/user.h -+++ b/arch/riscv64/bits/user.h -@@ -5,4 +5,4 @@ struct user_fpregs_struct { - - #define ELF_NGREG 32 - typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG]; --typedef struct user_fpregs_struct elf_fpregset_t; -+typedef union __riscv_mc_fp_state elf_fpregset_t; --- -2.23.0 - diff --git a/poky/meta/recipes-core/musl/musl/0001-correct-the-operand-specifiers-in-the-riscv64-CAS-ro.patch b/poky/meta/recipes-core/musl/musl/0001-correct-the-operand-specifiers-in-the-riscv64-CAS-ro.patch deleted file mode 100644 index 09b71cb29..000000000 --- a/poky/meta/recipes-core/musl/musl/0001-correct-the-operand-specifiers-in-the-riscv64-CAS-ro.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 59f2954fcaacd9426827c69a729e2647cb9977e5 Mon Sep 17 00:00:00 2001 -From: Palmer Dabbelt <palmer@sifive.com> -Date: Tue, 24 Sep 2019 20:30:15 -0700 -Subject: [PATCH] correct the operand specifiers in the riscv64 CAS routines - -The operand sepcifiers in a_cas and a_casp for riscv64 were incorrect: -there's a backwards branch in the routine, so despite tmp being written -at the end of the assembly fragment it cannot be allocated in one of the -input registers because the input values may be needed for another trip -around the loop. - -For code that follows the guarnteed forward progress requirements, he -backwards branch is rarely taken: SiFive's hardware only fails a store -conditional on execptional cases (ie, instruction cache misses inside -the loop), and until recently a bug in QEMU allowed back-to-back -store conditionals to succeed. The bug has been fixed in the latest -QEMU release, but it turns out that the fix caused this latent bug in -musl to manifest. - -Full disclosure: I haven't actually even compiled musl. I just guessed -this would fix a bug introducted by the new QEMU behavior, Alistair -(CC'd) actually checked it fixes the problem. The rest is just -conjecture. - -Upstream-Status: Submitted -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - arch/riscv64/atomic_arch.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/riscv64/atomic_arch.h b/arch/riscv64/atomic_arch.h -index c9765342..41ad4d04 100644 ---- a/arch/riscv64/atomic_arch.h -+++ b/arch/riscv64/atomic_arch.h -@@ -14,7 +14,7 @@ static inline int a_cas(volatile int *p, int t, int s) - " sc.w.aqrl %1, %4, (%2)\n" - " bnez %1, 1b\n" - "1:" -- : "=&r"(old), "=r"(tmp) -+ : "=&r"(old), "=&r"(tmp) - : "r"(p), "r"(t), "r"(s) - : "memory"); - return old; -@@ -31,7 +31,7 @@ static inline void *a_cas_p(volatile void *p, void *t, void *s) - " sc.d.aqrl %1, %4, (%2)\n" - " bnez %1, 1b\n" - "1:" -- : "=&r"(old), "=r"(tmp) -+ : "=&r"(old), "=&r"(tmp) - : "r"(p), "r"(t), "r"(s) - : "memory"); - return old; --- -2.23.0 - diff --git a/poky/meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch b/poky/meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch new file mode 100644 index 000000000..fcb324e15 --- /dev/null +++ b/poky/meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch @@ -0,0 +1,48 @@ +commit a0993f8f0f161423ecdcb754f282ffd2fe47a7b5 +Author: Rich Felker <dalias@aerifal.cx> +Date: Wed Oct 2 09:28:03 2019 -0400 + + reintroduce riscv64 struct sigcontext + + commit ab3eb89a8b83353cdaab12ed017a67a7730f90e9 removed it as part of + correcting the mcontext_t definition, but there is still code using + struct sigcontext and expecting the member names present in it, most + notably libgcc_eh. almost all such usage is incorrect, but bring back + struct sigcontext at least for now so as not to introduce regressions. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +diff --git a/arch/riscv64/bits/signal.h b/arch/riscv64/bits/signal.h +index 03fe48c1..2ff4be30 100644 +--- a/arch/riscv64/bits/signal.h ++++ b/arch/riscv64/bits/signal.h +@@ -6,12 +6,6 @@ + # define SIGSTKSZ 8192 + #endif + +-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) +-typedef unsigned long greg_t; +-typedef unsigned long gregset_t[32]; +-typedef union __riscv_mc_fp_state fpregset_t; +-#endif +- + typedef unsigned long __riscv_mc_gp_state[32]; + + struct __riscv_mc_f_ext_state { +@@ -41,6 +35,16 @@ typedef struct mcontext_t { + union __riscv_mc_fp_state __fpregs; + } mcontext_t; + ++#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) ++typedef unsigned long greg_t; ++typedef unsigned long gregset_t[32]; ++typedef union __riscv_mc_fp_state fpregset_t; ++struct sigcontext { ++ gregset_t gregs; ++ fpregset_t fpregs; ++}; ++#endif ++ + struct sigaltstack { + void *ss_sp; + int ss_flags; diff --git a/poky/meta/recipes-core/musl/musl_git.bb b/poky/meta/recipes-core/musl/musl_git.bb index 13fd17353..aacff79f7 100644 --- a/poky/meta/recipes-core/musl/musl_git.bb +++ b/poky/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "1f0e9f9cc2e3fa354f94e18b3b362de5f1ec7272" +SRCREV = "2c2477da9a553c0b9b2fa18073a5dcdbe6d395af" BASEVER = "1.1.23" @@ -15,8 +15,7 @@ PV = "${BASEVER}+git${SRCPV}" SRC_URI = "git://git.musl-libc.org/musl \ file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ - file://0001-correct-the-operand-specifiers-in-the-riscv64-CAS-ro.patch \ - file://0001-Change-container-for-riscv-floating-point-state-to-_.patch \ + file://0001-riscv-Define-sigcontext-again.patch \ " S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-core/ovmf/ovmf_git.bb b/poky/meta/recipes-core/ovmf/ovmf_git.bb index b569b593f..3b5a05e51 100644 --- a/poky/meta/recipes-core/ovmf/ovmf_git.bb +++ b/poky/meta/recipes-core/ovmf/ovmf_git.bb @@ -2,7 +2,7 @@ SUMMARY = "OVMF - UEFI firmware for Qemu and KVM" DESCRIPTION = "OVMF is an EDK II based project to enable UEFI support for \ Virtual Machines. OVMF contains sample UEFI firmware for QEMU and KVM" HOMEPAGE = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LICENSE_class-target = "${@bb.utils.contains('PACKAGECONFIG', 'secureboot', 'BSD & OpenSSL', 'BSD', d)}" LIC_FILES_CHKSUM = "file://OvmfPkg/License.txt;md5=06357ddc23f46577c2aeaeaf7b776d65" diff --git a/poky/meta/recipes-core/readline/readline-8.0/rl-native.map b/poky/meta/recipes-core/readline/readline-8.0/rl-native.map new file mode 100644 index 000000000..5e7d49cdd --- /dev/null +++ b/poky/meta/recipes-core/readline/readline-8.0/rl-native.map @@ -0,0 +1,12 @@ +READLINE_6.3 { + rl_change_environment; + rl_clear_history; + rl_executing_key; + rl_executing_keyseq; + rl_filename_stat_hook; + rl_history_substr_search_backward; + rl_history_substr_search_forward; + rl_input_available_hook; + rl_print_last_kbd_macro; + rl_signal_event_hook; +}; diff --git a/poky/meta/recipes-core/readline/readline.inc b/poky/meta/recipes-core/readline/readline.inc index e9665228d..07f54a76f 100644 --- a/poky/meta/recipes-core/readline/readline.inc +++ b/poky/meta/recipes-core/readline/readline.inc @@ -43,3 +43,8 @@ do_install_append () { BBCLASSEXTEND = "native nativesdk" CONFFILES_${PN} += "${sysconfdir}/inputrc" + +# OpenSuse injects versions into libreadline leading to conficits between our native one and theirs +# see their spec file for where this is injected. Extra versioning is harmless so we just do the same. +SRC_URI_append_class-native = " file://rl-native.map" +LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map"
\ No newline at end of file diff --git a/poky/meta/recipes-core/systemd/systemd_243.bb b/poky/meta/recipes-core/systemd/systemd_243.bb index b9097593f..6e7f95693 100644 --- a/poky/meta/recipes-core/systemd/systemd_243.bb +++ b/poky/meta/recipes-core/systemd/systemd_243.bb @@ -229,8 +229,6 @@ do_install() { install -d ${D}${sysconfdir}/udev/rules.d/ install -d ${D}${sysconfdir}/tmpfiles.d install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ - install -d ${D}${libdir}/pkgconfig - install -m 0644 ${B}/src/udev/udev.pc ${D}${libdir}/pkgconfig/ install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ @@ -297,13 +295,10 @@ do_install() { # install default policy for presets # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset -} -do_install_append () { - # Mips qemu is extremely slow, allow more time for the hwdb update - # This is a workaround until https://github.com/systemd/systemd/issues/13581 is resolved - [ ! -e ${D}${systemd_unitdir}/system/systemd-hwdb-update.service ] || - sed -i -e s#TimeoutSec=90s#TimeoutSec=180s# ${D}${systemd_unitdir}/system/systemd-hwdb-update.service + # We use package postinsts for the hwdb update, as the update service is + # easily triggered for no reason and will slow down boots. + find ${D} -name systemd-hwdb-update.service -delete } python populate_packages_prepend (){ diff --git a/poky/meta/recipes-devtools/apt/apt.inc b/poky/meta/recipes-devtools/apt/apt.inc index b855099e5..50c4d8484 100644 --- a/poky/meta/recipes-devtools/apt/apt.inc +++ b/poky/meta/recipes-devtools/apt/apt.inc @@ -1,4 +1,7 @@ SUMMARY = "Advanced front-end for dpkg" +DESCRIPTION = "Provides command-line tools for searching and managing as well \ +as querying information about packages as a low-level access to all features \ +of the libapt-pkg library." LICENSE = "GPLv2.0+" SECTION = "base" diff --git a/poky/meta/recipes-devtools/cmake/cmake.inc b/poky/meta/recipes-devtools/cmake/cmake.inc index 3711f18db..d8a9e2dd3 100644 --- a/poky/meta/recipes-devtools/cmake/cmake.inc +++ b/poky/meta/recipes-devtools/cmake/cmake.inc @@ -2,10 +2,14 @@ # Released under the MIT license (see packages/COPYING) SUMMARY = "Cross-platform, open-source make system" +DESCRIPTION = "CMake is used to control the software compilation process \ +using simple platform and compiler independent configuration files. CMake \ +generates native makefiles and workspaces that can be used in the compiler \ +environment of your choice." HOMEPAGE = "http://www.cmake.org/" BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" SECTION = "console/utils" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://Copyright.txt;md5=622747147b46f22e1953876a7cba3323 \ file://Source/cmake.h;md5=4494dee184212fc89c469c3acd555a14;beginline=1;endline=3 \ " diff --git a/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb b/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.1.bb index ae0a35da8..797db738f 100644 --- a/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb +++ b/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.1.bb @@ -8,16 +8,16 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "2077ba104eae04bb819e9e0c906c8c835b62e7a6" +SRCREV = "bc67f19ed09593e3886ebeee2391e9d51cc3439f" S = "${WORKDIR}/git" -DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm libmodulemd" +DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm" DEPENDS_append_class-native = " file-replacement-native" inherit cmake pkgconfig bash-completion distutils3-base -EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF" +EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF -DWITH_LIBMODULEMD=OFF" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.2.bb b/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.2.bb index 7dc4e417f..10220ebc9 100644 --- a/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.2.bb +++ b/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.2.bb @@ -1,4 +1,6 @@ SUMMARY = "GNU unit testing framework, written in Expect and Tcl" +DESCRIPTION = "DejaGnu is a framework for testing other programs. Its purpose \ +is to provide a single front end for all tests." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "devel" diff --git a/poky/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/poky/meta/recipes-devtools/dnf/dnf_4.2.2.bb index c77773332..f38167f1a 100644 --- a/poky/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/poky/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -1,4 +1,7 @@ SUMMARY = "Package manager forked from Yum, using libsolv as a dependency resolver" +DESCRIPTION = "Software package manager that installs, updates, and removes \ +packages on RPM-based Linux distributions. It automatically computes \ +dependencies and determines the actions required to install packages." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://PACKAGE-LICENSING;md5=4a0548e303dbc77f067335b4d688e745 \ @@ -71,7 +74,7 @@ do_install_append_class-native() { do_install_append_class-nativesdk() { create_wrapper ${D}/${bindir}/dnf \ RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ - RPM_NO_CHROOT_FOR_SCRIPTS=1 + RPM_NO_CHROOT_FOR_SCRIPTS=1 } SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ diff --git a/poky/meta/recipes-devtools/elfutils/elfutils_0.177.bb b/poky/meta/recipes-devtools/elfutils/elfutils_0.177.bb index 78c379193..818794266 100644 --- a/poky/meta/recipes-devtools/elfutils/elfutils_0.177.bb +++ b/poky/meta/recipes-devtools/elfutils/elfutils_0.177.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://sourceware.org/elfutils" SECTION = "base" LICENSE = "GPLv2 & LGPLv3+ & GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "libtool bzip2 zlib virtual/libintl" +DEPENDS = "bzip2 zlib virtual/libintl" DEPENDS_append_libc-musl = " argp-standalone fts musl-obstack " # The Debian patches below are from: # http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz diff --git a/poky/meta/recipes-devtools/file/file_5.37.bb b/poky/meta/recipes-devtools/file/file_5.37.bb index 803aa9a27..a840dbc01 100644 --- a/poky/meta/recipes-devtools/file/file_5.37.bb +++ b/poky/meta/recipes-devtools/file/file_5.37.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.darwinsys.com/file/" SECTION = "console/utils" # two clause BSD -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdda1b" DEPENDS = "zlib file-replacement-native" diff --git a/poky/meta/recipes-devtools/flex/flex_2.6.0.bb b/poky/meta/recipes-devtools/flex/flex_2.6.0.bb index 12ce0cb46..9bdd99c59 100644 --- a/poky/meta/recipes-devtools/flex/flex_2.6.0.bb +++ b/poky/meta/recipes-devtools/flex/flex_2.6.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Flex is a fast lexical analyser generator. Flex is a tool for ge lexical patterns in text." HOMEPAGE = "http://sourceforge.net/projects/flex/" SECTION = "devel" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" DEPENDS = "${@bb.utils.contains('PTEST_ENABLED', '1', 'bison-native flex-native', '', d)}" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-devtools/gdb/gdb-8.3.inc b/poky/meta/recipes-devtools/gdb/gdb-8.3.1.inc index 070c17d4a..39f1c48cc 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-8.3.inc +++ b/poky/meta/recipes-devtools/gdb/gdb-8.3.1.inc @@ -16,7 +16,6 @@ SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ file://0009-Change-order-of-CFLAGS.patch \ file://0010-resolve-restrict-keyword-conflict.patch \ file://0011-Fix-invalid-sigprocmask-call.patch \ - file://CVE-2017-9778.patch \ " -SRC_URI[md5sum] = "bbd95b2f9b34621ad7a19a3965476314" -SRC_URI[sha256sum] = "802f7ee309dcc547d65a68d61ebd6526762d26c3051f52caebe2189ac1ffd72e" +SRC_URI[md5sum] = "73b6a5d8141672c62bf851cd34c4aa83" +SRC_URI[sha256sum] = "1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4" diff --git a/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.bb b/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb index 301035940..301035940 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.bb +++ b/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb diff --git a/poky/meta/recipes-devtools/gdb/gdb-cross_8.3.bb b/poky/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb index 50cf159fd..50cf159fd 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-cross_8.3.bb +++ b/poky/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb diff --git a/poky/meta/recipes-devtools/gdb/gdb/CVE-2017-9778.patch b/poky/meta/recipes-devtools/gdb/gdb/CVE-2017-9778.patch deleted file mode 100644 index f142ed00d..000000000 --- a/poky/meta/recipes-devtools/gdb/gdb/CVE-2017-9778.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 6ad3791f095cfc1b0294f62c4b3a524ba735595e Mon Sep 17 00:00:00 2001 -From: Sandra Loosemore <sandra@codesourcery.com> -Date: Thu, 25 Apr 2019 07:27:02 -0700 -Subject: [PATCH] Detect invalid length field in debug frame FDE header. - -GDB was failing to catch cases where a corrupt ELF or core file -contained an invalid length value in a Dwarf debug frame FDE header. -It was checking for buffer overflow but not cases where the length was -negative or caused pointer wrap-around. - -In addition to the additional validity check, this patch cleans up the -multiple signed/unsigned conversions on the length field so that an -unsigned representation is used consistently throughout. - -This patch fixes CVE-2017-9778 and PR gdb/21600. - -2019-04-25 Sandra Loosemore <sandra@codesourcery.com> - Kang Li <kanglictf@gmail.com> - - PR gdb/21600 - - * dwarf2-frame.c (read_initial_length): Be consistent about using - unsigned representation of length. - (decode_frame_entry_1): Likewise. Check for wraparound of - end pointer as well as buffer overflow. - -Upstream-Status: Backport -CVE: CVE-2017-9778 -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - gdb/ChangeLog | 10 ++++++++++ - gdb/dwarf2-frame.c | 14 +++++++------- - 2 files changed, 17 insertions(+), 7 deletions(-) - -diff --git a/gdb/ChangeLog b/gdb/ChangeLog -index 1c125de..d028d2b 100644 ---- a/gdb/ChangeLog -+++ b/gdb/ChangeLog -@@ -1,3 +1,13 @@ -+2019-04-25 Sandra Loosemore <sandra@codesourcery.com> -+ Kang Li <kanglictf@gmail.com> -+ -+ PR gdb/21600 -+ -+ * dwarf2-frame.c (read_initial_length): Be consistent about using -+ unsigned representation of length. -+ (decode_frame_entry_1): Likewise. Check for wraparound of -+ end pointer as well as buffer overflow. -+ - 2019-05-11 Joel Brobecker <brobecker@adacore.com> - - * version.in: Set GDB version number to 8.3. -diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c -index 178ac44..dc5d3b3 100644 ---- a/gdb/dwarf2-frame.c -+++ b/gdb/dwarf2-frame.c -@@ -1488,7 +1488,7 @@ static ULONGEST - read_initial_length (bfd *abfd, const gdb_byte *buf, - unsigned int *bytes_read_ptr) - { -- LONGEST result; -+ ULONGEST result; - - result = bfd_get_32 (abfd, buf); - if (result == 0xffffffff) -@@ -1789,7 +1789,7 @@ decode_frame_entry_1 (struct comp_unit *unit, const gdb_byte *start, - { - struct gdbarch *gdbarch = get_objfile_arch (unit->objfile); - const gdb_byte *buf, *end; -- LONGEST length; -+ ULONGEST length; - unsigned int bytes_read; - int dwarf64_p; - ULONGEST cie_id; -@@ -1800,15 +1800,15 @@ decode_frame_entry_1 (struct comp_unit *unit, const gdb_byte *start, - buf = start; - length = read_initial_length (unit->abfd, buf, &bytes_read); - buf += bytes_read; -- end = buf + length; -- -- /* Are we still within the section? */ -- if (end > unit->dwarf_frame_buffer + unit->dwarf_frame_size) -- return NULL; -+ end = buf + (size_t) length; - - if (length == 0) - return end; - -+ /* Are we still within the section? */ -+ if (end <= buf || end > unit->dwarf_frame_buffer + unit->dwarf_frame_size) -+ return NULL; -+ - /* Distinguish between 32 and 64-bit encoded frame info. */ - dwarf64_p = (bytes_read == 12); - --- -2.20.1 - diff --git a/poky/meta/recipes-devtools/gdb/gdb_8.3.bb b/poky/meta/recipes-devtools/gdb/gdb_8.3.1.bb index d70757a15..d70757a15 100644 --- a/poky/meta/recipes-devtools/gdb/gdb_8.3.bb +++ b/poky/meta/recipes-devtools/gdb/gdb_8.3.1.bb diff --git a/poky/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/poky/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb index 4ff294c32..3f11e0231 100644 --- a/poky/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +++ b/poky/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb @@ -13,7 +13,7 @@ SRCREV = "751f89045b80d58c0d05800f74357cf78cdf7e77" S = "${WORKDIR}/git" -DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd json-c swig-native" +DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd-v1 json-c swig-native" inherit gtk-doc gobject-introspection cmake pkgconfig distutils3-base diff --git a/poky/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch b/poky/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch new file mode 100644 index 000000000..d950ad586 --- /dev/null +++ b/poky/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch @@ -0,0 +1,60 @@ +From 71c51206e037c0bb5759e01b307b7ce1d5934703 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 6 Sep 2019 17:07:00 +0200 +Subject: [PATCH] Do not generate gtkdoc or python bindings + +All of these really need a configuration option. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + meson.build | 12 ------------ + modulemd/meson.build | 8 -------- + 2 files changed, 20 deletions(-) + +diff --git a/meson.build b/meson.build +index 155c9e7..fe35d5e 100644 +--- a/meson.build ++++ b/meson.build +@@ -51,25 +51,13 @@ gnome = import('gnome') + pkg = import('pkgconfig') + gobject = dependency('gobject-2.0') + yaml = dependency('yaml-0.1') +-gtkdoc = dependency('gtk-doc') + + glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix') +-glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') + + sh = find_program('sh') + sed = find_program('sed') + test = find_program('test') + +-ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) +-if ret.returncode() != 0 +- error('Missing documentation for GLib.') +-endif +- +-ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')]) +-if ret.returncode() != 0 +- error('Missing documentation for GObject.') +-endif +- + python_name = get_option('python_name') + + if python_name != '' +diff --git a/modulemd/meson.build b/modulemd/meson.build +index 9a164b5..349c982 100644 +--- a/modulemd/meson.build ++++ b/modulemd/meson.build +@@ -523,11 +523,3 @@ configure_file( + configuration : xcdata + ) + +-gnome.gtkdoc( +- 'modulemd-1.0', +- install_dir: 'modulemd-1.0', +- src_dir : './modulemd', +- main_xml : 'modulemd-docs.xml', +- install : true, +-) +- diff --git a/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch b/poky/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch index 2598c177c..847b5f700 100644 --- a/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch +++ b/poky/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch @@ -1,4 +1,4 @@ -From 74ea6a665d0f3417e75f1d3d02f27a12f128ec70 Mon Sep 17 00:00:00 2001 +From 4e67f6049b3f822fe6f5af46790a51ace581bf82 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 6 Nov 2018 13:41:29 +0100 Subject: [PATCH] spec_tmpl.sh: use /bin/sh, not /usr/bin/sh @@ -11,7 +11,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec_tmpl.sh b/spec_tmpl.sh -index 14e895a..fc80fc6 100755 +index 0238087..126853c 100755 --- a/spec_tmpl.sh +++ b/spec_tmpl.sh @@ -1,4 +1,4 @@ @@ -19,4 +19,4 @@ index 14e895a..fc80fc6 100755 +#!/bin/sh version=$1 - libmodulemd_v1_version=$2 + template=$2 diff --git a/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/poky/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb index 63d3fad6a..9790470f4 100644 --- a/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb +++ b/poky/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb @@ -2,20 +2,20 @@ SUMMARY = "C Library for manipulating module metadata files" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb" -SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \ +SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=1.x-maint \ file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \ - file://0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch \ - file://0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch \ + file://0001-Do-not-generate-gtkdoc-or-python-bindings.patch \ " -PV = "2.6.0" -SRCREV = "7c7f88258491866cdb86d26cadfce37a78f242ec" +PV = "1.8.15" +SRCREV = "2d461725f781c6fdcf32893d8dcfa40bcef8dda5" +UPSTREAM_CHECK_GITTAGREGEX = "libmodulemd-(?P<pver>1.*\d)" S = "${WORKDIR}/git" inherit meson gobject-introspection -EXTRA_OEMESON = "-Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=true" +EXTRA_OEMESON = "-Ddeveloper_build=false" DEPENDS += "glib-2.0 libyaml glib-2.0-native python3" diff --git a/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch b/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch deleted file mode 100644 index 1568d25f9..000000000 --- a/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b651551134cf170038b3e01812e3767969506491 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 21 May 2019 17:59:26 +0200 -Subject: [PATCH] v1/meson.build: explicitly specify the v1 library in - pkgconfig - -Otherwise there would be '-lmodulemd' which resolves -to v2 version if both v2 and v1 are present in the sysroot. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - modulemd/v1/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build -index 4d54e69..9144ca2 100644 ---- a/modulemd/v1/meson.build -+++ b/modulemd/v1/meson.build -@@ -325,7 +325,7 @@ configure_file( - ) - - pkg.generate( -- libraries : modulemd_v1_lib, -+ libraries : '-l:libmodulemd.so.1', - subdirs : v1_header_path, - version : libmodulemd_v1_version, - name : 'modulemd', diff --git a/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch b/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch deleted file mode 100644 index 0b7535624..000000000 --- a/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 4a2a592c5a3898df37ff231d9c410f0fd32f5d5d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 6 Nov 2018 13:43:00 +0100 -Subject: [PATCH] modulemd/v[12]/meson.build: do not generate gtkdoc or python - bindings - -All of these really need a configuration option. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - meson.build | 3 +-- - modulemd/v1/meson.build | 8 -------- - modulemd/v2/meson.build | 12 ------------ - 3 files changed, 1 insertion(+), 22 deletions(-) - -diff --git a/meson.build b/meson.build -index 5a0cd3d..f51b16e 100644 ---- a/meson.build -+++ b/meson.build -@@ -52,7 +52,6 @@ gnome = import('gnome') - pkg = import('pkgconfig') - gobject = dependency('gobject-2.0') - yaml = dependency('yaml-0.1') --gtkdoc = dependency('gtk-doc') - - sh = find_program('sh') - sed = find_program('sed') -@@ -127,4 +126,4 @@ configure_file( - ) - - subdir('modulemd') --subdir('bindings/python') -+ -diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build -index ddc95a1..e85fafd 100644 ---- a/modulemd/v1/meson.build -+++ b/modulemd/v1/meson.build -@@ -356,11 +356,3 @@ configure_file( - configuration : xcdata - ) - --gnome.gtkdoc( -- 'modulemd-1.0', -- install_dir: 'modulemd-1.0', -- src_dir : './modulemd/v1', -- main_xml : 'modulemd-v1-docs.xml', -- install : true, --) -- -diff --git a/modulemd/v2/meson.build b/modulemd/v2/meson.build -index 93c7fbd..0d9ed24 100644 ---- a/modulemd/v2/meson.build -+++ b/modulemd/v2/meson.build -@@ -285,15 +285,3 @@ configure_file( - configuration : xcdata - ) - --gnome.gtkdoc( -- 'modulemd-2.0', -- install_dir: 'modulemd-2.0', -- src_dir : './modulemd/v2', -- main_xml : 'modulemd-v2-docs.xml', -- gobject_typesfile : join_paths(meson.current_build_dir(), 'modulemd-2.0.types'), -- dependencies : [ -- modulemd_v2_dep, -- ], -- install : true, --) -- diff --git a/poky/meta/recipes-devtools/librepo/librepo_1.10.5.bb b/poky/meta/recipes-devtools/librepo/librepo_1.10.6.bb index 87d64bf3a..cf4de22c4 100644 --- a/poky/meta/recipes-devtools/librepo/librepo_1.10.5.bb +++ b/poky/meta/recipes-devtools/librepo/librepo_1.10.6.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git \ file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ " -SRCREV = "385e2ced1083cac0bcb19e30500311f6923e6dfc" +SRCREV = "2ec349f1c686c1704dc83da6c118035ff57c8dea" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/llvm/llvm/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/poky/meta/recipes-devtools/llvm/llvm/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch index 789c30886..d75c94e9e 100644 --- a/poky/meta/recipes-devtools/llvm/llvm/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch +++ b/poky/meta/recipes-devtools/llvm/llvm/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch @@ -1,13 +1,11 @@ -From 4c08879d2dfbe7face4e679ac8499dc7bff2dd20 Mon Sep 17 00:00:00 2001 +From dbeecdb307be8b783b42cbc89dcb9c5e7f528989 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 21 May 2016 00:33:20 +0000 -Subject: [PATCH 06/19] llvm: TargetLibraryInfo: Undefine libc functions if - they are macros +Subject: [PATCH] llvm: TargetLibraryInfo: Undefine libc functions if they are macros musl defines some functions as macros and not inline functions if this is the case then make sure to undefine them -Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../llvm/Analysis/TargetLibraryInfo.def | 21 +++++++++++++++++++ @@ -87,6 +85,3 @@ index afed404f04c..876888656f2 100644 TLI_DEFINE_ENUM_INTERNAL(tmpfile64) TLI_DEFINE_STRING_INTERNAL("tmpfile64") /// int toascii(int c); --- -2.22.0 - diff --git a/poky/meta/recipes-devtools/llvm/llvm/0007-llvm-allow-env-override-of-exe-path.patch b/poky/meta/recipes-devtools/llvm/llvm/0007-llvm-allow-env-override-of-exe-path.patch index f47080c9f..58dce513c 100644 --- a/poky/meta/recipes-devtools/llvm/llvm/0007-llvm-allow-env-override-of-exe-path.patch +++ b/poky/meta/recipes-devtools/llvm/llvm/0007-llvm-allow-env-override-of-exe-path.patch @@ -1,14 +1,13 @@ -From b66d6f39a374b8df41e7235351e5dee2e81f440c Mon Sep 17 00:00:00 2001 +From 61b00e1e051e367f5483d7b5253b6c85a9e8a90f Mon Sep 17 00:00:00 2001 From: Martin Kelly <mkelly@xevo.com> Date: Fri, 19 May 2017 00:22:57 -0700 -Subject: [PATCH 07/19] llvm: allow env override of exe path +Subject: [PATCH] llvm: allow env override of exe path When using a native llvm-config from inside a sysroot, we need llvm-config to return the libraries, include directories, etc. from inside the sysroot rather than from the native sysroot. Thus provide an env override for calling llvm-config from a target sysroot. -Upstream-Status: Pending Signed-off-by: Martin Kelly <mkelly@xevo.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- @@ -33,6 +32,3 @@ index 7ef7c46a262..a4f7ed82c7b 100644 // This just needs to be some symbol in the binary; C++ doesn't // allow taking the address of ::main however. void *P = (void *)(intptr_t)GetExecutablePath; --- -2.22.0 - diff --git a/poky/meta/recipes-devtools/llvm/llvm_git.bb b/poky/meta/recipes-devtools/llvm/llvm_git.bb index 08b19a33e..5f9277fc0 100644 --- a/poky/meta/recipes-devtools/llvm/llvm_git.bb +++ b/poky/meta/recipes-devtools/llvm/llvm_git.bb @@ -3,10 +3,10 @@ DESCRIPTION = "The LLVM Compiler Infrastructure" HOMEPAGE = "http://llvm.org" -LICENSE = "NCSA" +LICENSE = "Apache-2.0-with-LLVM-exception" SECTION = "devel" -LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648" +LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe" DEPENDS = "libffi libxml2 zlib libedit ninja-native llvm-native" @@ -16,17 +16,17 @@ inherit cmake pkgconfig PROVIDES += "llvm${PV}" +MAJOR_VERSION = "9" +MINOR_VERSION = "0" +PATCH_VERSION = "0" + +PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}" + LLVM_RELEASE = "${PV}" LLVM_DIR = "llvm${LLVM_RELEASE}" -SRCREV = "19a71f6bdf2dddb10764939e7f0ec2b98dba76c9" - BRANCH = "release/${MAJOR_VERSION}.x" -MAJOR_VERSION = "8" -MINOR_VERSION = "0" -PATCH_VERSION = "1" -SOLIBVER = "1" -PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}" +SRCREV = "0399d5a9682b3cef71c653373e38890c63c4c365" SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \ file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2 \ file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ @@ -45,6 +45,7 @@ def get_llvm_arch(bb, d, arch_var): elif re.match(r'aarch64$', a): return 'AArch64' elif re.match(r'aarch64_be$', a): return 'AArch64' elif re.match(r'mips(isa|)(32|64|)(r6|)(el|)$', a): return 'Mips' + elif re.match(r'riscv(32|64)(eb|)$', a): return 'RISCV' elif re.match(r'p(pc|owerpc)(|64)', a): return 'PowerPC' else: raise bb.parse.SkipRecipe("Cannot map '%s' to a supported LLVM architecture" % a) @@ -86,8 +87,6 @@ EXTRA_OECMAKE_append_class-nativesdk = "\ -DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config${PV} \ " -CXXFLAGS_append_class-target_powerpc = " -mlongcall" - do_configure_prepend() { # Fix paths in llvm-config sed -i "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g" ${S}/tools/llvm-config/llvm-config.cpp @@ -158,7 +157,7 @@ FILES_${PN}-liblto += "\ " FILES_${PN}-liboptremarks += "\ - ${libdir}/${LLVM_DIR}/libOptRemarks.so.* \ + ${libdir}/${LLVM_DIR}/libRemarks.so.* \ " FILES_${PN}-llvmhello = "\ @@ -167,7 +166,7 @@ FILES_${PN}-llvmhello = "\ FILES_${PN}-dev += " \ ${libdir}/${LLVM_DIR}/llvm-config \ - ${libdir}/${LLVM_DIR}/libOptRemarks.so \ + ${libdir}/${LLVM_DIR}/libRemarks.so \ ${libdir}/${LLVM_DIR}/libLLVM-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.so \ " diff --git a/poky/meta/recipes-devtools/meson/meson.inc b/poky/meta/recipes-devtools/meson/meson.inc index 6de109de7..ae0091c05 100644 --- a/poky/meta/recipes-devtools/meson/meson.inc +++ b/poky/meta/recipes-devtools/meson/meson.inc @@ -1,5 +1,8 @@ HOMEPAGE = "http://mesonbuild.com" SUMMARY = "A high performance build system" +DESCRIPTION = "Meson is a build system designed to increase programmer \ +productivity. It does this by providing a fast, simple and easy to use \ +interface for modern software development tools and practices." LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" @@ -11,14 +14,11 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0001-python-module-do-not-manipulate-the-environment-when.patch \ file://disable-rpath-handling.patch \ file://cross-prop-default.patch \ - file://0001-environment.py-detect-windows-also-if-the-system-str.patch \ - file://0001-mesonbuild-environment.py-do-not-determine-whether-a.patch \ file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ - file://vala-cross-compile.patch \ " -SRC_URI[sha256sum] = "23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76" -SRC_URI[md5sum] = "d46c4a8e3cfd27f90e2c6fe4a69e574b" +SRC_URI[sha256sum] = "d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32" +SRC_URI[md5sum] = "7ea7772414dda8ae11072244bf7ba991" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \ @@ -29,6 +29,6 @@ UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" inherit setuptools3 -RDEPENDS_${PN} = "ninja python3-core python3-modules" +RDEPENDS_${PN} = "ninja python3-modules python3-pkg-resources" FILES_${PN} += "${datadir}/polkit-1" diff --git a/poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index 444fc0816..fc55dcacf 100644 --- a/poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -1,4 +1,4 @@ -From f70fee13e4dbc757cd8153cd42d92fa9394fb542 Mon Sep 17 00:00:00 2001 +From c07d29b715209cd5d75b142a00a540d45b00c36d Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal @@ -12,7 +12,7 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 03c6346..86b350b 100644 +index a59cd89..17de654 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py @@ -186,7 +186,7 @@ class MachineInfo: @@ -25,10 +25,10 @@ index 03c6346..86b350b 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 0cfdf9c..40aa189 100644 +index 3704921..f1988f2 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -262,9 +262,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: +@@ -251,9 +251,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: trial = 'parisc' if trial not in known_cpu_families: diff --git a/poky/meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch b/poky/meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch deleted file mode 100644 index 37b5356d7..000000000 --- a/poky/meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b52e47c9d61dc4c930cfc7236fbeb70338c3b953 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 25 Mar 2019 17:17:06 +0100 -Subject: [PATCH] environment.py: detect windows also if the system string - contains 'mingw' - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - mesonbuild/envconfig.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 03c6346..a59cd89 100644 ---- a/mesonbuild/envconfig.py -+++ b/mesonbuild/envconfig.py -@@ -198,7 +198,7 @@ class MachineInfo: - """ - Machine is windows? - """ -- return self.system in {'windows', 'mingw'} -+ return self.system == 'windows' or 'mingw' in self.system - - def is_cygwin(self) -> bool: - """ --- -2.17.1 - diff --git a/poky/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch b/poky/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch index 7c3238bf9..471f1500d 100644 --- a/poky/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +++ b/poky/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch @@ -1,4 +1,4 @@ -From 1afbf5ccff56e582229c8f673f50aedf2b24117e Mon Sep 17 00:00:00 2001 +From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 4 Aug 2017 16:16:41 +0300 Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling @@ -20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 4 insertions(+) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index bf49770..7c5a363 100644 +index bcf77b9..6a4b472 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py -@@ -972,6 +972,10 @@ This will become a hard error in the future.''') - '--mode=' + mode] +@@ -974,6 +974,10 @@ This will become a hard error in the future.''') + args.append('--{}={}'.format(program_name, path)) if namespace: args.append('--namespace=' + namespace) + gtkdoc_exe_wrapper = state.environment.properties.host.get('gtkdoc_exe_wrapper', None) diff --git a/poky/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch b/poky/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch deleted file mode 100644 index 8cb11879f..000000000 --- a/poky/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ec9c4a22424a5d55fcf213a55d03f096ec24bcae Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 25 Mar 2019 18:18:33 +0100 -Subject: [PATCH] mesonbuild/environment.py: do not determine whether a build - is cross by comparing architectures - -This can, and does, go wrong when our host architecture is same as the target one(e.g. x86_64). - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - mesonbuild/environment.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 84a7596..9a029f4 100644 ---- a/mesonbuild/environment.py -+++ b/mesonbuild/environment.py -@@ -520,7 +520,7 @@ class Environment: - self.first_invocation = True - - def is_cross_build(self) -> bool: -- return not self.machines.matches_build_machine(MachineChoice.HOST) -+ return self.need_exe_wrapper() - - def dump_coredata(self): - return coredata.save(self.coredata, self.get_build_dir()) diff --git a/poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index 8ad86a46e..b8837d77b 100644 --- a/poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ b/poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch @@ -1,4 +1,4 @@ -From 3009a1c2f1b736b836a057d84dc11f379cba99cf Mon Sep 17 00:00:00 2001 +From 263fc0e26e1fd92e25fa3ef93f4a549dcebc5887 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt <pkj@axis.com> Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again @@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> 1 file changed, 1 insertion(+) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 86b350b..aa426ca 100644 +index 17de654..2d2deef 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T') diff --git a/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 57de598d2..76cc4931d 100644 --- a/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch +++ b/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -1,4 +1,4 @@ -From ac38495de38a1ea42e2bc09a2f23c2e945fbc22d Mon Sep 17 00:00:00 2001 +From 4a1d676522d6b56cbe9a45c3b040afaa27d37f78 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Date: Wed, 15 Nov 2017 15:05:01 +0100 Subject: [PATCH] native_bindir @@ -22,10 +22,10 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 21da8e2..7d1ef85 100644 +index 3c55a56..eb52fd1 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py -@@ -155,7 +155,7 @@ class Dependency: +@@ -185,7 +185,7 @@ class Dependency: def get_exe_args(self, compiler): return [] @@ -34,7 +34,7 @@ index 21da8e2..7d1ef85 100644 raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) def get_configtool_variable(self, variable_name): -@@ -214,7 +214,7 @@ class InternalDependency(Dependency): +@@ -248,7 +248,7 @@ class InternalDependency(Dependency): self.sources = sources self.ext_deps = ext_deps @@ -43,7 +43,7 @@ index 21da8e2..7d1ef85 100644 raise DependencyException('Method "get_pkgconfig_variable()" is ' 'invalid for an internal dependency') -@@ -639,15 +639,18 @@ class PkgConfigDependency(ExternalDependency): +@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency): return s.format(self.__class__.__name__, self.name, self.is_found, self.version_reqs) @@ -65,7 +65,7 @@ index 21da8e2..7d1ef85 100644 # Always copy the environment since we're going to modify it # with pkg-config variables if env is None: -@@ -663,7 +666,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency): targs = tuple(args) cache = PkgConfigDependency.pkgbin_cache if (self.pkgbin, targs, fenv) not in cache: @@ -74,16 +74,16 @@ index 21da8e2..7d1ef85 100644 return cache[(self.pkgbin, targs, fenv)] def _convert_mingw_paths(self, args): -@@ -845,7 +848,7 @@ class PkgConfigDependency(ExternalDependency): - (self.name, out_raw)) - self.link_args, self.raw_link_args = self._search_libs(out, out_raw) +@@ -926,7 +929,7 @@ class PkgConfigDependency(ExternalDependency): + mlog.warning('Could not determine complete list of dependencies for %s' % self.name) + self.link_args, self.raw_link_args = self._search_libs(out, out_raw, out_all) - def get_pkgconfig_variable(self, variable_name, kwargs): + def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): options = ['--variable=' + variable_name, self.name] if 'define_variable' in kwargs: -@@ -858,7 +861,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -939,7 +942,7 @@ class PkgConfigDependency(ExternalDependency): options = ['--define-variable=' + '='.join(definition)] + options diff --git a/poky/meta/recipes-devtools/meson/meson/vala-cross-compile.patch b/poky/meta/recipes-devtools/meson/meson/vala-cross-compile.patch deleted file mode 100644 index 816f810c0..000000000 --- a/poky/meta/recipes-devtools/meson/meson/vala-cross-compile.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d Mon Sep 17 00:00:00 2001 -From: James Westman <flyingpimonster@flyingpimonster.net> -Date: Mon, 24 Jun 2019 12:04:12 -0500 -Subject: [PATCH] Fix two errors when cross-compiling with Vala - -- AttributeError: 'ValaCompiler' object has no attribute 'get_program_dirs' - - Fixed by adding a `get_program_dirs()` function to the base Compiler - class, to match `get_library_dirs()` - -- KeyError: 'vala_COMPILER' - - Fixed by creating the Vala compile rules for all machines, not just - the build machine. - -Upstream-Status: Backport [https://github.com/mesonbuild/meson/commit/77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - mesonbuild/backend/ninjabackend.py | 3 +-- - mesonbuild/compilers/compilers.py | 3 +++ - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py -index a454e6ab5f..b830e377e4 100644 ---- a/mesonbuild/backend/ninjabackend.py -+++ b/mesonbuild/backend/ninjabackend.py -@@ -1653,8 +1653,7 @@ def generate_compile_rule_for(self, langname, compiler): - self.generate_cs_compile_rule(compiler) - return - if langname == 'vala': -- if self.environment.machines.matches_build_machine(compiler.for_machine): -- self.generate_vala_compile_rules(compiler) -+ self.generate_vala_compile_rules(compiler) - return - if langname == 'rust': - self.generate_rust_compile_rules(compiler) -diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py -index 5855de71c8..86c1e33407 100644 ---- a/mesonbuild/compilers/compilers.py -+++ b/mesonbuild/compilers/compilers.py -@@ -1117,6 +1117,9 @@ def find_library(self, *args, **kwargs): - def get_library_dirs(self, *args, **kwargs): - return () - -+ def get_program_dirs(self, *args, **kwargs): -+ return () -+ - def has_multi_arguments(self, args, env) -> Tuple[bool, bool]: - raise EnvironmentException( - 'Language {} does not support has_multi_arguments.'.format( diff --git a/poky/meta/recipes-devtools/meson/meson_0.51.2.bb b/poky/meta/recipes-devtools/meson/meson_0.52.0.bb index de9b905c1..897fa148d 100644 --- a/poky/meta/recipes-devtools/meson/meson_0.51.2.bb +++ b/poky/meta/recipes-devtools/meson/meson_0.52.0.bb @@ -1,4 +1,3 @@ include meson.inc BBCLASSEXTEND = "native" - diff --git a/poky/meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb b/poky/meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb index 1756f342c..1756f342c 100644 --- a/poky/meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb +++ b/poky/meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb diff --git a/poky/meta/recipes-devtools/perl/perl_5.30.0.bb b/poky/meta/recipes-devtools/perl/perl_5.30.0.bb index a221bce52..1d906a751 100644 --- a/poky/meta/recipes-devtools/perl/perl_5.30.0.bb +++ b/poky/meta/recipes-devtools/perl/perl_5.30.0.bb @@ -35,12 +35,13 @@ S = "${WORKDIR}/perl-${PV}" inherit upstream-version-is-even -DEPENDS += "gdbm zlib virtual/crypt" +DEPENDS += "zlib virtual/crypt" PERL_LIB_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}.0" -PACKAGECONFIG ??= "bdb" +PACKAGECONFIG ??= "bdb gdbm" PACKAGECONFIG[bdb] = ",-Ui_db,db" +PACKAGECONFIG[gdbm] = ",-Ui_gdbm,gdbm" # Don't generate comments in enc2xs output files. They are not reproducible export ENC2XS_NO_COMMENTS = "1" @@ -265,13 +266,23 @@ python split_perl_packages () { # Read the pre-generated dependency file, and use it to set module dependecies for line in open(d.expand("${WORKDIR}") + '/perl-rdepends.txt').readlines(): splitline = line.split() - module = splitline[0].replace("RDEPENDS_perl", "RDEPENDS_${PN}") - depends = splitline[2].strip('"').replace("perl-module", "${PN}-module") + if bb.data.inherits_class('native', d): + module = splitline[0] + '-native' + depends = "perl-native" + else: + module = splitline[0].replace("RDEPENDS_perl", "RDEPENDS_${PN}") + depends = splitline[2].strip('"').replace("perl-module", "${PN}-module") d.appendVar(d.expand(module), " " + depends) } -PACKAGES_DYNAMIC_class-target += "^perl-module-.*" -PACKAGES_DYNAMIC_class-nativesdk += "^nativesdk-perl-module-.*" +python() { + if d.getVar('CLASSOVERRIDE') == "class-target": + d.setVar("PACKAGES_DYNAMIC", "^perl-module-.*(?<!native)$") + elif d.getVar('CLASSOVERRIDE') == "class-native": + d.setVar("PACKAGES_DYNAMIC", "^perl-module-.*-native$") + elif d.getVar('CLASSOVERRIDE') == "class-nativesdk": + d.setVar("PACKAGES_DYNAMIC", "^nativesdk-perl-module-.*") +} RDEPENDS_${PN}-misc += "perl perl-modules" RDEPENDS_${PN}-pod += "perl" diff --git a/poky/meta/recipes-devtools/python/python-async.inc b/poky/meta/recipes-devtools/python/python-async.inc index 139bf2c51..af887dc4e 100644 --- a/poky/meta/recipes-devtools/python/python-async.inc +++ b/poky/meta/recipes-devtools/python/python-async.inc @@ -1,7 +1,7 @@ SUMMARY = "Python framework to process interdependent tasks in a pool of workers" HOMEPAGE = "http://github.com/gitpython-developers/async" SECTION = "devel/python" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=88df8e78b9edfd744953862179f2d14e" inherit pypi diff --git a/poky/meta/recipes-devtools/python/python-smmap.inc b/poky/meta/recipes-devtools/python/python-smmap.inc index 1a2259e4b..b878b4b39 100644 --- a/poky/meta/recipes-devtools/python/python-smmap.inc +++ b/poky/meta/recipes-devtools/python/python-smmap.inc @@ -4,7 +4,7 @@ help unifying memory mapped access on 32 and 64 bit systems and to help \ managing resources more efficiently." HOMEPAGE = "http://github.com/gitpython-developers/GitPython" SECTION = "devel/python" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" inherit pypi diff --git a/poky/meta/recipes-devtools/python/python/0001-2.7-bpo-34155-Dont-parse-domains-containing-GH-13079.patch b/poky/meta/recipes-devtools/python/python/0001-2.7-bpo-34155-Dont-parse-domains-containing-GH-13079.patch new file mode 100644 index 000000000..5415472a3 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python/0001-2.7-bpo-34155-Dont-parse-domains-containing-GH-13079.patch @@ -0,0 +1,90 @@ +From 532ed09c5454bb789a301bb6f1339a0818255610 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Roberto=20C=2E=20S=C3=A1nchez?= <roberto@connexer.com> +Date: Sat, 14 Sep 2019 13:26:38 -0400 +Subject: [PATCH] [2.7] bpo-34155: Dont parse domains containing @ (GH-13079) + (GH-16006) + +This change skips parsing of email addresses where domains include a "@" character, which can be maliciously used since the local part is returned as a complete address. + +(cherry picked from commit 8cb65d1381b027f0b09ee36bfed7f35bb4dec9a9) + +Excludes changes to Lib/email/_header_value_parser.py, which did not +exist in 2.7. + +Co-authored-by: jpic <jpic@users.noreply.github.com> + +https://bugs.python.org/issue34155 + +Upstream-Status: Backport [https://github.com/python/cpython/commit/8cb65d1381b027f0b09ee36bfed7f35bb4dec9a9] + +CVE: CVE-2019-16056 + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + Lib/email/_parseaddr.py | 11 ++++++++++- + Lib/email/test/test_email.py | 14 ++++++++++++++ + .../2019-05-04-13-33-37.bpo-34155.MJll68.rst | 1 + + 3 files changed, 25 insertions(+), 1 deletion(-) + create mode 100644 Misc/NEWS.d/next/Security/2019-05-04-13-33-37.bpo-34155.MJll68.rst + +diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py +index 690db2c22d..dc49d2e45a 100644 +--- a/Lib/email/_parseaddr.py ++++ b/Lib/email/_parseaddr.py +@@ -336,7 +336,12 @@ class AddrlistClass: + aslist.append('@') + self.pos += 1 + self.gotonext() +- return EMPTYSTRING.join(aslist) + self.getdomain() ++ domain = self.getdomain() ++ if not domain: ++ # Invalid domain, return an empty address instead of returning a ++ # local part to denote failed parsing. ++ return EMPTYSTRING ++ return EMPTYSTRING.join(aslist) + domain + + def getdomain(self): + """Get the complete domain name from an address.""" +@@ -351,6 +356,10 @@ class AddrlistClass: + elif self.field[self.pos] == '.': + self.pos += 1 + sdlist.append('.') ++ elif self.field[self.pos] == '@': ++ # bpo-34155: Don't parse domains with two `@` like ++ # `a@malicious.org@important.com`. ++ return EMPTYSTRING + elif self.field[self.pos] in self.atomends: + break + else: +diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py +index 4b4dee3d34..2efe44ac5a 100644 +--- a/Lib/email/test/test_email.py ++++ b/Lib/email/test/test_email.py +@@ -2306,6 +2306,20 @@ class TestMiscellaneous(TestEmailBase): + self.assertEqual(Utils.parseaddr('<>'), ('', '')) + self.assertEqual(Utils.formataddr(Utils.parseaddr('<>')), '') + ++ def test_parseaddr_multiple_domains(self): ++ self.assertEqual( ++ Utils.parseaddr('a@b@c'), ++ ('', '') ++ ) ++ self.assertEqual( ++ Utils.parseaddr('a@b.c@c'), ++ ('', '') ++ ) ++ self.assertEqual( ++ Utils.parseaddr('a@172.17.0.1@c'), ++ ('', '') ++ ) ++ + def test_noquote_dump(self): + self.assertEqual( + Utils.formataddr(('A Silly Person', 'person@dom.ain')), +diff --git a/Misc/NEWS.d/next/Security/2019-05-04-13-33-37.bpo-34155.MJll68.rst b/Misc/NEWS.d/next/Security/2019-05-04-13-33-37.bpo-34155.MJll68.rst +new file mode 100644 +index 0000000000..50292e29ed +--- /dev/null ++++ b/Misc/NEWS.d/next/Security/2019-05-04-13-33-37.bpo-34155.MJll68.rst +@@ -0,0 +1 @@ ++Fix parsing of invalid email addresses with more than one ``@`` (e.g. a@b@c.com.) to not return the part before 2nd ``@`` as valid email address. Patch by maxking & jpic. diff --git a/poky/meta/recipes-devtools/python/python3/0001-bpo-34155-Dont-parse-domains-containing-GH-13079.patch b/poky/meta/recipes-devtools/python/python3/0001-bpo-34155-Dont-parse-domains-containing-GH-13079.patch new file mode 100644 index 000000000..319e7ed07 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3/0001-bpo-34155-Dont-parse-domains-containing-GH-13079.patch @@ -0,0 +1,132 @@ +From 90d56127ae15b1e452755e62c77dc475dedf7161 Mon Sep 17 00:00:00 2001 +From: jpic <jpic@users.noreply.github.com> +Date: Wed, 17 Jul 2019 23:54:25 +0200 +Subject: [PATCH] bpo-34155: Dont parse domains containing @ (GH-13079) + +Before: + + >>> email.message_from_string('From: a@malicious.org@important.com', policy=email.policy.default)['from'].addresses + (Address(display_name='', username='a', domain='malicious.org'),) + + >>> parseaddr('a@malicious.org@important.com') + ('', 'a@malicious.org') + + After: + + >>> email.message_from_string('From: a@malicious.org@important.com', policy=email.policy.default)['from'].addresses + (Address(display_name='', username='', domain=''),) + + >>> parseaddr('a@malicious.org@important.com') + ('', 'a@') + +https://bugs.python.org/issue34155 + +Upstream-Status: Backport [https://github.com/python/cpython/commit/8cb65d1381b027f0b09ee36bfed7f35bb4dec9a9] + +CVE: CVE-2019-16056 + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + Lib/email/_header_value_parser.py | 2 ++ + Lib/email/_parseaddr.py | 11 ++++++++++- + Lib/test/test_email/test__header_value_parser.py | 10 ++++++++++ + Lib/test/test_email/test_email.py | 14 ++++++++++++++ + .../2019-05-04-13-33-37.bpo-34155.MJll68.rst | 1 + + 5 files changed, 37 insertions(+), 1 deletion(-) + create mode 100644 Misc/NEWS.d/next/Security/2019-05-04-13-33-37.bpo-34155.MJll68.rst + +diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py +index fc00b4a098..bbc026ec71 100644 +--- a/Lib/email/_header_value_parser.py ++++ b/Lib/email/_header_value_parser.py +@@ -1582,6 +1582,8 @@ def get_domain(value): + token, value = get_dot_atom(value) + except errors.HeaderParseError: + token, value = get_atom(value) ++ if value and value[0] == '@': ++ raise errors.HeaderParseError('Invalid Domain') + if leader is not None: + token[:0] = [leader] + domain.append(token) +diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py +index cdfa3729ad..41ff6f8c00 100644 +--- a/Lib/email/_parseaddr.py ++++ b/Lib/email/_parseaddr.py +@@ -379,7 +379,12 @@ class AddrlistClass: + aslist.append('@') + self.pos += 1 + self.gotonext() +- return EMPTYSTRING.join(aslist) + self.getdomain() ++ domain = self.getdomain() ++ if not domain: ++ # Invalid domain, return an empty address instead of returning a ++ # local part to denote failed parsing. ++ return EMPTYSTRING ++ return EMPTYSTRING.join(aslist) + domain + + def getdomain(self): + """Get the complete domain name from an address.""" +@@ -394,6 +399,10 @@ class AddrlistClass: + elif self.field[self.pos] == '.': + self.pos += 1 + sdlist.append('.') ++ elif self.field[self.pos] == '@': ++ # bpo-34155: Don't parse domains with two `@` like ++ # `a@malicious.org@important.com`. ++ return EMPTYSTRING + elif self.field[self.pos] in self.atomends: + break + else: +diff --git a/Lib/test/test_email/test__header_value_parser.py b/Lib/test/test_email/test__header_value_parser.py +index 693487bc96..7dc4de1b7b 100644 +--- a/Lib/test/test_email/test__header_value_parser.py ++++ b/Lib/test/test_email/test__header_value_parser.py +@@ -1438,6 +1438,16 @@ class TestParser(TestParserMixin, TestEmailBase): + self.assertEqual(addr_spec.domain, 'example.com') + self.assertEqual(addr_spec.addr_spec, 'star.a.star@example.com') + ++ def test_get_addr_spec_multiple_domains(self): ++ with self.assertRaises(errors.HeaderParseError): ++ parser.get_addr_spec('star@a.star@example.com') ++ ++ with self.assertRaises(errors.HeaderParseError): ++ parser.get_addr_spec('star@a@example.com') ++ ++ with self.assertRaises(errors.HeaderParseError): ++ parser.get_addr_spec('star@172.17.0.1@example.com') ++ + # get_obs_route + + def test_get_obs_route_simple(self): +diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py +index c29cc56203..aa775881c5 100644 +--- a/Lib/test/test_email/test_email.py ++++ b/Lib/test/test_email/test_email.py +@@ -3041,6 +3041,20 @@ class TestMiscellaneous(TestEmailBase): + self.assertEqual(utils.parseaddr('<>'), ('', '')) + self.assertEqual(utils.formataddr(utils.parseaddr('<>')), '') + ++ def test_parseaddr_multiple_domains(self): ++ self.assertEqual( ++ utils.parseaddr('a@b@c'), ++ ('', '') ++ ) ++ self.assertEqual( ++ utils.parseaddr('a@b.c@c'), ++ ('', '') ++ ) ++ self.assertEqual( ++ utils.parseaddr('a@172.17.0.1@c'), ++ ('', '') ++ ) ++ + def test_noquote_dump(self): + self.assertEqual( + utils.formataddr(('A Silly Person', 'person@dom.ain')), +diff --git a/Misc/NEWS.d/next/Security/2019-05-04-13-33-37.bpo-34155.MJll68.rst b/Misc/NEWS.d/next/Security/2019-05-04-13-33-37.bpo-34155.MJll68.rst +new file mode 100644 +index 0000000000..50292e29ed +--- /dev/null ++++ b/Misc/NEWS.d/next/Security/2019-05-04-13-33-37.bpo-34155.MJll68.rst +@@ -0,0 +1 @@ ++Fix parsing of invalid email addresses with more than one ``@`` (e.g. a@b@c.com.) to not return the part before 2nd ``@`` as valid email address. Patch by maxking & jpic. diff --git a/poky/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch b/poky/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch index 1741f5753..1709011be 100644 --- a/poky/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch @@ -1,4 +1,4 @@ -From 17796e353acf08acd604610f34840a4a9d2f4b54 Mon Sep 17 00:00:00 2001 +From eff903c600f4c40f5753e95ab1557126fc6e0c9c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 31 Jan 2019 16:46:30 +0100 Subject: [PATCH] distutils/sysconfig: append @@ -15,10 +15,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 2 files changed, 4 insertions(+) diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index e07a6c8..6b8c129 100644 +index 0a034ee..3dfd0a3 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py -@@ -421,6 +421,8 @@ def _init_posix(): +@@ -439,6 +439,8 @@ def _init_posix(): platform=sys.platform, multiarch=getattr(sys.implementation, '_multiarch', ''), )) @@ -28,10 +28,10 @@ index e07a6c8..6b8c129 100644 build_time_vars = _temp.build_time_vars global _config_vars diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 9ee4d31..e586abd 100644 +index 87fa5e6..756a41c 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -412,6 +412,8 @@ def _init_posix(vars): +@@ -419,6 +419,8 @@ def _init_posix(vars): """Initialize the module as appropriate for POSIX systems.""" # _sysconfigdata is generated at build time, see _generate_posix_vars() name = _get_sysconfigdata_name() diff --git a/poky/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch b/poky/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch index a0ed7cc83..a146c747f 100644 --- a/poky/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch +++ b/poky/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch @@ -1,4 +1,4 @@ -From ffe7797637f08cd6ee4c82e2d67462c5e194d30a Mon Sep 17 00:00:00 2001 +From 5ce3ac59531828ff682646fbba59b2126b28a8aa Mon Sep 17 00:00:00 2001 From: Jaewon Lee <jaewon.lee@xilinx.com> Date: Thu, 25 Apr 2019 15:34:26 -0700 Subject: [PATCH] main.c: if OEPYTHON3HOME is set use instead of PYTHONHOME @@ -12,15 +12,16 @@ to set a different path for python3 Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com> Upstream-Status: Inappropriate [OE specific configuration] + --- Modules/main.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Modules/main.c b/Modules/main.c -index a745381..b553e30 100644 +index acc59c6..407085a 100644 --- a/Modules/main.c +++ b/Modules/main.c -@@ -1855,10 +1855,19 @@ config_init_home(_PyCoreConfig *config) +@@ -1834,10 +1834,19 @@ config_init_home(_PyCoreConfig *config) } return _Py_INIT_OK(); } @@ -44,6 +45,3 @@ index a745381..b553e30 100644 } config->home = home; return _Py_INIT_OK(); --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch b/poky/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch new file mode 100644 index 000000000..c15295c03 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch @@ -0,0 +1,31 @@ +From e3b59cb9658e1d3efa3535840939a0fa92a70a5a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 7 Oct 2019 13:22:14 +0200 +Subject: [PATCH] setup.py: do not report missing dependencies for disabled + modules + +Reporting those missing dependencies is misleading as the modules would not +have been built anyway. This particularly matters in oe-core's automated +build completeness checker which relies on the report. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + setup.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/setup.py b/setup.py +index 4b53668..0097643 100644 +--- a/setup.py ++++ b/setup.py +@@ -365,6 +365,10 @@ class PyBuildExt(build_ext): + print("%-*s %-*s %-*s" % (longest, e, longest, f, + longest, g)) + ++ # There is no need to report missing module dependencies, ++ # if the modules have been disabled in the first place. ++ missing = list(set(missing) - set(sysconf_dis)) ++ + if missing: + print() + print("Python build finished successfully!") diff --git a/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch index 0bafec73c..d49604ba4 100644 --- a/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +++ b/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch @@ -1,4 +1,4 @@ -From 6229502e5ae6cbb22240594f002638e9ef78f831 Mon Sep 17 00:00:00 2001 +From a274ba778838824efcacaba57c415b7262f779ec Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 14 May 2013 15:00:26 -0700 Subject: [PATCH] python3: Add target and native recipes diff --git a/poky/meta/recipes-devtools/python/python3_3.7.4.bb b/poky/meta/recipes-devtools/python/python3_3.7.4.bb index 8693c446c..c8b63fee9 100644 --- a/poky/meta/recipes-devtools/python/python3_3.7.4.bb +++ b/poky/meta/recipes-devtools/python/python3_3.7.4.bb @@ -23,11 +23,13 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \ file://0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch \ file://0001-Makefile-fix-Issue36464-parallel-build-race-problem.patch \ - file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \ - file://crosspythonpath.patch \ + file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \ + file://crosspythonpath.patch \ file://reformat_sysconfig.py \ file://0001-Use-FLAG_REF-always-for-interned-strings.patch \ file://0001-test_locale.py-correct-the-test-output-format.patch \ + file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \ + file://0001-bpo-34155-Dont-parse-domains-containing-GH-13079.patch \ " SRC_URI_append_class-native = " \ @@ -62,7 +64,7 @@ ALTERNATIVE_LINK_NAME[python-config] = "${bindir}/python${PYTHON_BINABI}-config" ALTERNATIVE_TARGET[python-config] = "${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}" -DEPENDS = "bzip2-replacement-native libffi bzip2 gdbm openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2" +DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2" DEPENDS_append_class-target = " python3-native" DEPENDS_append_class-nativesdk = " python3-native" @@ -87,13 +89,23 @@ python() { d.setVar('PACKAGECONFIG_PGO', '') } -PACKAGECONFIG_class-target ??= "readline ${PACKAGECONFIG_PGO}" -PACKAGECONFIG_class-native ??= "readline" -PACKAGECONFIG_class-nativesdk ??= "readline" +PACKAGECONFIG_class-target ??= "readline ${PACKAGECONFIG_PGO} gdbm" +PACKAGECONFIG_class-native ??= "readline gdbm" +PACKAGECONFIG_class-nativesdk ??= "readline gdbm" PACKAGECONFIG[readline] = ",,readline" # Use profile guided optimisation by running PyBench inside qemu-user PACKAGECONFIG[pgo] = "--enable-optimizations,,qemu-native" PACKAGECONFIG[tk] = ",,tk" +PACKAGECONFIG[gdbm] = ",,gdbm" + +do_configure_prepend () { + mkdir -p ${B}/Modules + cat > ${B}/Modules/Setup.local << EOF +*disabled* +${@bb.utils.contains('PACKAGECONFIG', 'gdbm', '', '_gdbm _dbm', d)} +${@bb.utils.contains('PACKAGECONFIG', 'readline', '', 'readline', d)} +EOF +} CPPFLAGS_append = " -I${STAGING_INCDIR}/ncursesw -I${STAGING_INCDIR}/uuid" diff --git a/poky/meta/recipes-devtools/python/python_2.7.16.bb b/poky/meta/recipes-devtools/python/python_2.7.16.bb index 5b856a509..aec877825 100644 --- a/poky/meta/recipes-devtools/python/python_2.7.16.bb +++ b/poky/meta/recipes-devtools/python/python_2.7.16.bb @@ -30,6 +30,7 @@ SRC_URI += " \ file://support_SOURCE_DATE_EPOCH_in_py_compile_2.7.patch \ file://float-endian.patch \ file://0001-python2-use-cc_basename-to-replace-CC-for-checking-c.patch \ + file://0001-2.7-bpo-34155-Dont-parse-domains-containing-GH-13079.patch \ " S = "${WORKDIR}/Python-${PV}" diff --git a/poky/meta/recipes-devtools/qemu/qemu.inc b/poky/meta/recipes-devtools/qemu/qemu.inc index de21d3073..88ae68a1e 100644 --- a/poky/meta/recipes-devtools/qemu/qemu.inc +++ b/poky/meta/recipes-devtools/qemu/qemu.inc @@ -1,4 +1,8 @@ SUMMARY = "Fast open source processor emulator" +DESCRIPTION = "QEMU is a hosted virtual machine monitor: it emulates the \ +machine's processor through dynamic binary translation and provides a set \ +of different hardware and device models for the machine, enabling it to run \ +a variety of guest operating systems" HOMEPAGE = "http://qemu.org" LICENSE = "GPLv2 & LGPLv2.1" @@ -53,7 +57,7 @@ do_install_ptest() { } # QEMU_TARGETS is overridable variable -QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc riscv32 riscv64 sh4 x86_64" +QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc ppc64 riscv32 riscv64 sh4 x86_64" EXTRA_OECONF = " \ --prefix=${prefix} \ diff --git a/poky/meta/recipes-devtools/quilt/quilt.inc b/poky/meta/recipes-devtools/quilt/quilt.inc index 433e9b40b..d6d06c049 100644 --- a/poky/meta/recipes-devtools/quilt/quilt.inc +++ b/poky/meta/recipes-devtools/quilt/quilt.inc @@ -1,4 +1,7 @@ SUMMARY = "Tool for working with series of patches" +DESCRIPTION = "Quilt is a tool to manage large sets of patches by keeping \ +track of the changes each patch makes. Patches can be applied, un-applied,\ +refreshed, etc." HOMEPAGE = "http://savannah.nongnu.org/projects/quilt/" SECTION = "devel" LICENSE = "GPLv2" diff --git a/poky/meta/recipes-devtools/swig/swig.inc b/poky/meta/recipes-devtools/swig/swig.inc index 00b9c5b60..e62718c50 100644 --- a/poky/meta/recipes-devtools/swig/swig.inc +++ b/poky/meta/recipes-devtools/swig/swig.inc @@ -1,4 +1,7 @@ SUMMARY = "SWIG - Simplified Wrapper and Interface Generator" +DESCRIPTION = "SWIG is a compiler that makes it easy to integrate C and C++ \ +code with other languages including Perl, Tcl, Ruby, Python, Java, Guile, \ +Mzscheme, Chicken, OCaml, Pike, and C#." HOMEPAGE = "http://swig.sourceforge.net/" LICENSE = "BSD & GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \ diff --git a/poky/meta/recipes-devtools/unfs3/unfs3_git.bb b/poky/meta/recipes-devtools/unfs3/unfs3_git.bb index a4ac46c68..79d09788d 100644 --- a/poky/meta/recipes-devtools/unfs3/unfs3_git.bb +++ b/poky/meta/recipes-devtools/unfs3/unfs3_git.bb @@ -1,4 +1,7 @@ SUMMARY = "Userspace NFS server v3 protocol" +DESCRIPTION = "UNFS3 is a user-space implementation of the NFSv3 server \ +specification. It provides a daemon for the MOUNT and NFS protocols, which \ +are used by NFS clients for accessing files on the server." SECTION = "console/network" LICENSE = "unfs3" LIC_FILES_CHKSUM = "file://LICENSE;md5=9475885294e17c0cc0067820d042792e" diff --git a/poky/meta/recipes-devtools/vala/vala_0.44.7.bb b/poky/meta/recipes-devtools/vala/vala_0.46.3.bb index 807ca7a21..eda5738c0 100644 --- a/poky/meta/recipes-devtools/vala/vala_0.44.7.bb +++ b/poky/meta/recipes-devtools/vala/vala_0.46.3.bb @@ -4,5 +4,5 @@ SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pat file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \ " -SRC_URI[md5sum] = "27fd30535c51af5b87b0e7ffdbd906ef" -SRC_URI[sha256sum] = "bf1ff4f59d5de2d626e98e98ef81cb75dc1e6a27610a7de4133597c430f1bd7c" +SRC_URI[md5sum] = "809ddac69b039ef509b61993c848613f" +SRC_URI[sha256sum] = "e29c2b1f108dc22c91bb501975a77c938aef079ca7875e1fbf41191e22cc57e3" diff --git a/poky/meta/recipes-extended/cups/cups.inc b/poky/meta/recipes-extended/cups/cups.inc index e303f3424..2149cbe4c 100644 --- a/poky/meta/recipes-extended/cups/cups.inc +++ b/poky/meta/recipes-extended/cups/cups.inc @@ -1,4 +1,8 @@ SUMMARY = "An Internet printing system for Unix" +DESCRIPTION = "The Common UNIX Printing System is a printing system and \ +general replacement for lpd and the like. It supports the Internet Printing \ +Protocol (IPP), and has its own filtering driver model for handling various \ +document types." HOMEPAGE = "https://www.cups.org/" SECTION = "console/utils" LICENSE = "GPLv2 & LGPLv2" diff --git a/poky/meta/recipes-extended/ethtool/ethtool_5.2.bb b/poky/meta/recipes-extended/ethtool/ethtool_5.2.bb index e9759bd21..67e7fadee 100644 --- a/poky/meta/recipes-extended/ethtool/ethtool_5.2.bb +++ b/poky/meta/recipes-extended/ethtool/ethtool_5.2.bb @@ -14,6 +14,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ SRC_URI[md5sum] = "79cff0d4af62b030ad28be90414b5c4a" SRC_URI[sha256sum] = "8ad6cb30f6e1767d9d23a5cb5f606f3b51f83e85ebf0153c1506194f6709e90b" +UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" + inherit autotools ptest bash-completion RDEPENDS_${PN}-ptest += "make" diff --git a/poky/meta/recipes-extended/ghostscript/ghostscript_9.27.bb b/poky/meta/recipes-extended/ghostscript/ghostscript_9.27.bb index 349c0c2e8..9e1f3e2f4 100644 --- a/poky/meta/recipes-extended/ghostscript/ghostscript_9.27.bb +++ b/poky/meta/recipes-extended/ghostscript/ghostscript_9.27.bb @@ -59,7 +59,7 @@ PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${ST --without-x, virtual/libx11 libxext libxt gtk+3\ " -EXTRA_OECONF = "--with-system-libtiff --without-jbig2dec \ +EXTRA_OECONF = "--without-libpaper --with-system-libtiff --without-jbig2dec \ --with-fontpath=${datadir}/fonts \ --without-libidn --with-cups-serverbin=${exec_prefix}/lib/cups \ --with-cups-datadir=${datadir}/cups \ @@ -71,7 +71,7 @@ EXTRA_OECONF_append_mipsarcho32 = " --with-large_color_index=0" # Explicity disable libtiff, fontconfig, # freetype, cups for ghostscript-native EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \ - --without-jbig2dec \ + --without-jbig2dec --without-libpaper \ --with-fontpath=${datadir}/fonts \ --without-libidn --disable-fontconfig \ --disable-freetype --disable-cups" diff --git a/poky/meta/recipes-extended/libarchive/libarchive_3.4.0.bb b/poky/meta/recipes-extended/libarchive/libarchive_3.4.0.bb index c789cd44d..9c0d5e26e 100644 --- a/poky/meta/recipes-extended/libarchive/libarchive_3.4.0.bb +++ b/poky/meta/recipes-extended/libarchive/libarchive_3.4.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Support for reading various archive formats" DESCRIPTION = "C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats" HOMEPAGE = "http://www.libarchive.org/" SECTION = "devel" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=fe01f5e02b1f0cc934d593a7b0ddceb6" DEPENDS = "e2fsprogs-native" diff --git a/poky/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb b/poky/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb index 9c480b825..e73ffe7b1 100644 --- a/poky/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb +++ b/poky/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Libtirpc is a port of Suns Transport-Independent RPC library to L SECTION = "libs/network" HOMEPAGE = "http://sourceforge.net/projects/libtirpc/" BUGTRACKER = "http://sourceforge.net/tracker/?group_id=183075&atid=903784" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \ file://src/netname.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24" diff --git a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb index 2e83c821a..20ce69872 100644 --- a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb +++ b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb @@ -2,7 +2,7 @@ SUMMARY = "Lightweight high-performance web server" HOMEPAGE = "http://www.lighttpd.net/" BUGTRACKER = "http://redmine.lighttpd.net/projects/lighttpd/issues" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579" SECTION = "net" diff --git a/poky/meta/recipes-extended/msmtp/msmtp_1.8.5.bb b/poky/meta/recipes-extended/msmtp/msmtp_1.8.6.bb index 4f6b66f22..809144b78 100644 --- a/poky/meta/recipes-extended/msmtp/msmtp_1.8.5.bb +++ b/poky/meta/recipes-extended/msmtp/msmtp_1.8.6.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/" SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz" -SRC_URI[md5sum] = "5d7bb10606fbceeb2e0687379c75234b" -SRC_URI[sha256sum] = "1613daced9c47b8c028224fc076799c2a4d72923e242be4e9e5c984cbbbb9f39" +SRC_URI[md5sum] = "adff4a9992e1b47aa5468b974550304e" +SRC_URI[sha256sum] = "6625f147430c65ba8527f52c4fe5d4d33552d3c0fb6d793ba7df819a3b3042e1" inherit gettext autotools update-alternatives pkgconfig diff --git a/poky/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb b/poky/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb index 7b1b0a117..1275cc009 100644 --- a/poky/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb +++ b/poky/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb @@ -5,7 +5,7 @@ machines. The output of this version is fully compatible with bzip2 v1.0.2 or \ newer (ie: anything compressed with pbzip2 can be decompressed with bzip2)." HOMEPAGE = "http://compression.ca/pbzip2/" SECTION = "console/utils" -LICENSE = "BSD" +LICENSE = "BSD-4-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=398b8832c6f840cfebd20ab2be6a3743" DEPENDS = "bzip2" diff --git a/poky/meta/recipes-extended/rpcbind/rpcbind_1.2.5.bb b/poky/meta/recipes-extended/rpcbind/rpcbind_1.2.5.bb index 7c96aca36..19d778b6d 100644 --- a/poky/meta/recipes-extended/rpcbind/rpcbind_1.2.5.bb +++ b/poky/meta/recipes-extended/rpcbind/rpcbind_1.2.5.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://sourceforge.net/projects/rpcbind/" BUGTRACKER = "http://sourceforge.net/tracker/?group_id=201237&atid=976751" DEPENDS = "libtirpc quota" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=b46486e4c4a416602693a711bb5bfa39 \ file://src/rpcinfo.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24" diff --git a/poky/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb b/poky/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb index ef014628f..79fc8b80b 100644 --- a/poky/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb +++ b/poky/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb @@ -1,6 +1,6 @@ SUMMARY = "Shadow utils requirements for useradd.bbclass" -HOMEPAGE = "http://pkg-shadow.alioth.debian.org" -BUGTRACKER = "https://alioth.debian.org/tracker/?group_id=30580" +HOMEPAGE = "http://github.com/shadow-maint/shadow" +BUGTRACKER = "http://github.com/shadow-maint/shadow/issues" SECTION = "base utils" LICENSE = "BSD | Artistic-1.0" LIC_FILES_CHKSUM = "file://login.defs_shadow-sysroot;md5=25e2f2de4dfc8f966ac5cdfce45cd7d5" @@ -27,6 +27,6 @@ do_install() { SYSROOT_DIRS += "${sysconfdir}" # don't create any packages -# otherwise: dbus-dev depends on shadow-sysroot-dev which depends on shadow-sysroot +# otherwise: dbus-dev depends on shadow-sysroot-dev which depends on shadow-sysroot # and this has another copy of /etc/login.defs already provided by shadow PACKAGES = "" diff --git a/poky/meta/recipes-extended/shadow/shadow.inc b/poky/meta/recipes-extended/shadow/shadow.inc index af38b911d..770c239e9 100644 --- a/poky/meta/recipes-extended/shadow/shadow.inc +++ b/poky/meta/recipes-extended/shadow/shadow.inc @@ -1,6 +1,6 @@ SUMMARY = "Tools to change and administer password and group data" -HOMEPAGE = "http://pkg-shadow.alioth.debian.org" -BUGTRACKER = "https://alioth.debian.org/tracker/?group_id=30580" +HOMEPAGE = "http://github.com/shadow-maint/shadow" +BUGTRACKER = "http://github.com/shadow-maint/shadow/issues" SECTION = "base/utils" LICENSE = "BSD | Artistic-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=ed80ff1c2b40843cf5768e5229cf16e5 \ @@ -59,7 +59,7 @@ NSCDOPT = "" NSCDOPT_class-native = "--without-nscd" NSCDOPT_class-nativesdk = "--without-nscd" NSCDOPT_libc-glibc = "--with-nscd" - + PAM_PLUGINS = "libpam-runtime \ pam-plugin-faildelay \ pam-plugin-securetty \ @@ -136,7 +136,7 @@ do_install_append() { sed -i -f ${WORKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs fi - install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} + install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} # Move binaries to the locations we want rm ${D}${sbindir}/vigr diff --git a/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb index dd945c970..bd0c84c24 100644 --- a/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb +++ b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Tools for monitoring and filtering incoming requests for tcp \ services." SECTION = "console/network" -LICENSE = "BSD" +LICENSE = "BSD-1-Clause" LIC_FILES_CHKSUM = "file://DISCLAIMER;md5=071bd69cb78b18888ea5e3da5c3127fa" PR ="r10" diff --git a/poky/meta/recipes-extended/timezone/timezone.inc b/poky/meta/recipes-extended/timezone/timezone.inc index f6bab1acb..91a5cb332 100644 --- a/poky/meta/recipes-extended/timezone/timezone.inc +++ b/poky/meta/recipes-extended/timezone/timezone.inc @@ -1,4 +1,6 @@ SUMMARY = "Timezone data" +DESCRIPTION = "The Time Zone Database contains code and data that represent \ +the history of local time for many representative locations around the globe." HOMEPAGE = "http://www.iana.org/time-zones" SECTION = "base" LICENSE = "PD & BSD & BSD-3-Clause" diff --git a/poky/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch b/poky/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch index 338e0cd14..075a98e5e 100644 --- a/poky/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch +++ b/poky/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch @@ -34,7 +34,7 @@ index 7a2fc36..f31d1fe 100644 -ExecStart=/bin/sh -c '[ $run_watchdog != 1 ] || exec /usr/sbin/watchdog $watchdog_options' -ExecStopPost=/bin/sh -c '[ $run_wd_keepalive != 1 ] || false' +ExecStart=/bin/sh -c '[ x$run_watchdog != x1 ] || exec /usr/sbin/watchdog $watchdog_options' -+PIDFile=/var/run/watchdog.pid ++PIDFile=/run/watchdog.pid [Install] -WantedBy=default.target diff --git a/poky/meta/recipes-extended/wget/wget.inc b/poky/meta/recipes-extended/wget/wget.inc index 07e8d8e87..233832821 100644 --- a/poky/meta/recipes-extended/wget/wget.inc +++ b/poky/meta/recipes-extended/wget/wget.inc @@ -1,4 +1,9 @@ SUMMARY = "Console URL download utility supporting HTTP, FTP, etc" +DESCRIPTION = "Wget is a network utility to retrieve files from the web using \ +HTTP(S) and FTP, the two most widely used internet protocols. It works \ +non-interactively, so it will work in the background, after having logged off. \ +The program supports recursive retrieval of web-authoring pages as well as \ +FTP sites" HOMEPAGE = "https://www.gnu.org/software/wget/" SECTION = "console/network" LICENSE = "GPLv3" diff --git a/poky/meta/recipes-gnome/epiphany/epiphany_3.32.4.bb b/poky/meta/recipes-gnome/epiphany/epiphany_3.34.1.bb index 44af46994..f5f086391 100644 --- a/poky/meta/recipes-gnome/epiphany/epiphany_3.32.4.bb +++ b/poky/meta/recipes-gnome/epiphany/epiphany_3.34.1.bb @@ -13,8 +13,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ " -SRC_URI[archive.md5sum] = "6a5eada8a3870ab4d0fcd5168559776f" -SRC_URI[archive.sha256sum] = "c9a828578301af77ac9f3d3ce253b02f9f3a1561840cc8d74dd5645f92d0a995" +SRC_URI[archive.md5sum] = "50b50e18d99b19f44cc9cd419c6a4ba8" +SRC_URI[archive.sha256sum] = "a07bc997ad2cbf14d58557bb0b63e92d8c33683680c5e50ea6f9b53b36bec1d9" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch index 5747d61c1..639f9c8f6 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch @@ -1,4 +1,4 @@ -From 2b3bce1526b538dc2c7fa223eaf9808858aa1b06 Mon Sep 17 00:00:00 2001 +From 0417a1bb08745f2bf5310d20b342c2b3b9b212d3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 15 Nov 2018 15:10:05 +0100 Subject: [PATCH] Port cross-compilation support to meson @@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 3 files changed, 68 insertions(+), 18 deletions(-) diff --git a/gir/meson.build b/gir/meson.build -index 85ae575..327c134 100644 +index c312100..a028033 100644 --- a/gir/meson.build +++ b/gir/meson.build -@@ -36,16 +36,29 @@ gir_files = [ +@@ -41,16 +41,29 @@ gir_files = [ typelibdir = join_paths(get_option('libdir'), 'girepository-1.0') install_data(gir_files, install_dir: girdir) @@ -56,7 +56,7 @@ index 85ae575..327c134 100644 dep_type = glib_dep.type_name() if dep_type == 'internal' -@@ -58,6 +71,12 @@ if dep_type == 'internal' +@@ -63,6 +76,12 @@ if dep_type == 'internal' '--extra-library=glib-2.0', '--extra-library=gobject-2.0'] endif @@ -69,7 +69,7 @@ index 85ae575..327c134 100644 # Take a glob and print to newlines globber = ''' from glob import glob -@@ -84,8 +103,8 @@ glib_command = scanner_command + [ +@@ -89,8 +108,8 @@ glib_command = scanner_command + [ if dep_type == 'pkgconfig' glib_command += ['--external-library', '--pkg=glib-2.0'] @@ -80,8 +80,8 @@ index 85ae575..327c134 100644 glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include') glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h') glib_files += join_paths(glib_libincdir, 'glibconfig.h') -@@ -339,7 +358,7 @@ endforeach - if giounix_dep.found() +@@ -345,7 +364,7 @@ if giounix_dep.found() + dep_type = giounix_dep.type_name() if dep_type == 'pkgconfig' gio_command += ['--pkg=gio-unix-2.0'] - giounix_includedir = join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0') @@ -89,7 +89,7 @@ index 85ae575..327c134 100644 # Get the installed gio-unix header list ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h'))) if ret.returncode() != 0 -@@ -422,15 +441,24 @@ gir_files += custom_target('gir-girepository', +@@ -428,15 +447,24 @@ gir_files += custom_target('gir-girepository', ) typelibs = [] @@ -119,10 +119,10 @@ index 85ae575..327c134 100644 install_dir: typelibdir, ) diff --git a/meson.build b/meson.build -index 95bbd2b..f7baefd 100644 +index a5e825f..a28490a 100644 --- a/meson.build +++ b/meson.build -@@ -163,7 +163,9 @@ endif +@@ -168,7 +168,9 @@ endif subdir('girepository') subdir('tools') subdir('giscanner') diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch index a4f45a142..a15401aeb 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch @@ -1,4 +1,4 @@ -From 8f01066e935a7323ff6e53f27ed1b5fb74fa11eb Mon Sep 17 00:00:00 2001 +From 673623851fb70c0e43cf79cef67b3751432ebe72 Mon Sep 17 00:00:00 2001 From: Sascha Silbe <x-yo17@se-silbe.de> Date: Fri, 8 Jun 2018 13:55:10 +0200 Subject: [PATCH] Relocate the repository directory for native builds @@ -62,10 +62,10 @@ index ca5dc2b..7a4d17f 100644 typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); diff --git a/girepository/meson.build b/girepository/meson.build -index 0261e1a..4cb646f 100644 +index 1d7aed6..5637fb5 100644 --- a/girepository/meson.build +++ b/girepository/meson.build -@@ -36,7 +36,7 @@ girepo_internals_lib = static_library('girepository-internals', +@@ -44,7 +44,7 @@ girepo_internals_lib = static_library('girepository-internals', ], c_args: gi_hidden_visibility_cflags + custom_c_args, include_directories : configinc, diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch deleted file mode 100644 index d1fdc068c..000000000 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 8a57aa0ac6c2f00b9b7a7fc177431f7643399e70 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 23 Mar 2016 17:07:28 +0200 -Subject: [PATCH] Revert an incomplete upstream attempt at cross-compile - support - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - common.mk | 4 ---- - giscanner/gdumpparser.py | 6 ------ - 2 files changed, 10 deletions(-) - -diff --git a/common.mk b/common.mk -index 64fb02f..77e819d 100644 ---- a/common.mk -+++ b/common.mk -@@ -24,12 +24,8 @@ INTROSPECTION_SCANNER_ARGS = \ - --add-include-path=$(top_builddir) \ - --add-include-path=$(top_builddir)/gir - --# GI_CROSS_LAUNCHER is the command to use for executing g-ir-compiler. --# Normally will be undefined but can be set (e.g. to wine or qemu) --# when cross-compiling - INTROSPECTION_COMPILER = \ - env PATH=".libs:$(PATH)" \ -- $(GI_CROSS_LAUNCHER) \ - $(top_builddir)/g-ir-compiler$(EXEEXT) - - INTROSPECTION_COMPILER_ARGS = \ -diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py -index 1730fee..26bab84 100644 ---- a/giscanner/gdumpparser.py -+++ b/giscanner/gdumpparser.py -@@ -156,12 +156,6 @@ blob containing data gleaned from GObject's primitive introspection.""" - out_path = os.path.join(self._binary.tmpdir, 'dump.xml') - - args = [] -- -- # Prepend the launcher command and arguments, if defined -- launcher = os.environ.get('GI_CROSS_LAUNCHER') -- if launcher: -- args.extend(launcher.split()) -- - args.extend(self._binary.args) - args.append('--introspect-dump=%s,%s' % (in_path, out_path)) - diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch deleted file mode 100644 index e4fffcf61..000000000 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch +++ /dev/null @@ -1,201 +0,0 @@ -From 2335d22e4c64db3d5dfc16ac65468b9dd66db8ac Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 19 Oct 2015 18:29:21 +0300 -Subject: [PATCH] configure.ac: add host-gi, gi-cross-wrapper, gi-ldd-wrapper - and introspection-data options - -With the first option, gobject-introspection tools (g-ir-doc-tool and g-ir-scanner) -that are already installed in the host system will be used for building the source tree. - -With the second option, g-ir-scanner will be instructed to use an executable -wrapper to run binaries it's producing, and g-ir-compiler will be run -through the same wrapper (host system's g-ir-compiler cannot be used because -it's producing architecture-specific output). - -With the third option, giscanner will be instructed to use a special ldd -command instead of system's ldd (which does not work when the binary to inspect -is compiled for a different architecture). - -With the fourth option, it is possible to disable building of introspection data -(.gir and .typelib files), which may be difficult or impossible in cross-compilation -environments, because of lack of emulation (or native hardware) for the target architecture -on which the target binaries can be run. - -These options are useful when cross-compiling for a different target architecture. - -Upstream-Status: Pending [review on oe-core list] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - Makefile.am | 2 ++ - common.mk | 39 +++++++++++++++++++++++++++++++++++++++ - configure.ac | 42 ++++++++++++++++++++++++++++++++++++++++++ - tests/Makefile.am | 5 ++++- - 4 files changed, 87 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 952bf71..797a3bd 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -21,7 +21,9 @@ include Makefile-cmph.am - include Makefile-girepository.am - include Makefile-giscanner.am - include Makefile-examples.am -+if BUILD_INTROSPECTION_DATA - include Makefile-gir.am -+endif - include Makefile-tools.am - - ## Process this file with automake to produce Makefile.in -diff --git a/common.mk b/common.mk -index 77e819d..379ab53 100644 ---- a/common.mk -+++ b/common.mk -@@ -6,6 +6,15 @@ - # module itself. - # - -+if USE_HOST_GI -+INTROSPECTION_SCANNER = \ -+ env PATH="$(PATH)" \ -+ LPATH=.libs \ -+ CC="$(CC)" \ -+ PYTHONPATH=$(top_builddir):$(top_srcdir) \ -+ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \ -+ g-ir-scanner -+else - INTROSPECTION_SCANNER = \ - env PATH=".libs:$(PATH)" \ - LPATH=.libs \ -@@ -14,9 +23,24 @@ INTROSPECTION_SCANNER = \ - UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ - UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \ - $(top_builddir)/g-ir-scanner -+endif -+ -+if USE_CROSS_WRAPPER -+CROSS_WRAPPER_ARG = --use-binary-wrapper=$(GI_CROSS_WRAPPER) -+else -+CROSS_WRAPPER_ARG = -+endif -+ -+if USE_LDD_WRAPPER -+LDD_WRAPPER_ARG = --use-ldd-wrapper=$(GI_LDD_WRAPPER) -+else -+LDD_WRAPPER_ARG = -+endif - - INTROSPECTION_SCANNER_ARGS = \ - --verbose \ -+ $(CROSS_WRAPPER_ARG) \ -+ $(LDD_WRAPPER_ARG) \ - -I$(top_srcdir) \ - --add-include-path=$(srcdir) \ - --add-include-path=$(top_srcdir)/gir \ -@@ -24,9 +48,15 @@ INTROSPECTION_SCANNER_ARGS = \ - --add-include-path=$(top_builddir) \ - --add-include-path=$(top_builddir)/gir - -+if USE_CROSS_WRAPPER -+INTROSPECTION_COMPILER = \ -+ env PATH=".libs:$(PATH)" \ -+ $(GI_CROSS_WRAPPER) $(top_builddir)/.libs/g-ir-compiler$(EXEEXT) -+else - INTROSPECTION_COMPILER = \ - env PATH=".libs:$(PATH)" \ - $(top_builddir)/g-ir-compiler$(EXEEXT) -+endif - - INTROSPECTION_COMPILER_ARGS = \ - --includedir=$(srcdir) \ -@@ -35,6 +65,14 @@ INTROSPECTION_COMPILER_ARGS = \ - --includedir=$(top_builddir) \ - --includedir=$(top_builddir)/gir - -+if USE_HOST_GI -+INTROSPECTION_DOCTOOL = \ -+ env PATH="$(PATH)" \ -+ LPATH=.libs \ -+ PYTHONPATH=$(top_builddir):$(top_srcdir) \ -+ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \ -+ g-ir-doc-tool -+else - INTROSPECTION_DOCTOOL = \ - env PATH=".libs:$(PATH)" \ - LPATH=.libs \ -@@ -42,6 +80,7 @@ INTROSPECTION_DOCTOOL = \ - UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ - UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \ - $(top_builddir)/g-ir-doc-tool -+endif - - INTROSPECTION_DOCTOOL_ARGS = \ - --add-include-path=$(srcdir) \ -diff --git a/configure.ac b/configure.ac -index 885da70..cd8108b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -383,6 +383,48 @@ dnl - AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x]) - AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x]) - -+AC_ARG_ENABLE([host-gi], -+[AS_HELP_STRING([--enable-host-gi],[Use gobject introspection tools installed in the host system (useful when cross-compiling)])], -+[case "${enableval}" in -+ yes) host_gi=true ;; -+ no) host_gi=false ;; -+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-host-gi]) ;; -+esac],[host_gi=false]) -+AM_CONDITIONAL([USE_HOST_GI], [test x$host_gi = xtrue]) -+ -+AC_ARG_ENABLE([gi-cross-wrapper], -+[AS_HELP_STRING([--enable-gi-cross-wrapper=path],[Use a wrapper to run gicompiler and binaries produced by giscanner (useful when cross-compiling)])], -+[ -+GI_CROSS_WRAPPER="${enableval}" -+use_wrapper=true -+],[ -+GI_CROSS_WRAPPER="" -+use_wrapper=false -+]) -+AC_SUBST(GI_CROSS_WRAPPER) -+AM_CONDITIONAL([USE_CROSS_WRAPPER], [test x$use_wrapper = xtrue]) -+ -+AC_ARG_ENABLE([gi-ldd-wrapper], -+[AS_HELP_STRING([--enable-gi-ldd-wrapper=path],[Use a ldd wrapper instead of system's ldd command in giscanner (useful when cross-compiling)])], -+[ -+GI_LDD_WRAPPER="${enableval}" -+use_ldd_wrapper=true -+],[ -+GI_LDD_WRAPPER="" -+use_ldd_wrapper=false -+]) -+AC_SUBST(GI_LDD_WRAPPER) -+AM_CONDITIONAL([USE_LDD_WRAPPER], [test x$use_ldd_wrapper = xtrue]) -+ -+AC_ARG_ENABLE([introspection-data], -+[AS_HELP_STRING([--enable-introspection-data],[Build introspection data (.gir and .typelib files) in addition to library and tools])], -+[case "${enableval}" in -+ yes) introspection_data=true ;; -+ no) introspection_data=false ;; -+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-introspection-data]) ;; -+esac],[introspection_data=true]) -+AM_CONDITIONAL([BUILD_INTROSPECTION_DATA], [test x$introspection_data = xtrue]) -+ - AC_CONFIG_FILES([ - Makefile - tests/Makefile -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 4bdb9c3..10b0f27 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -1,6 +1,9 @@ - include $(top_srcdir)/common.mk - --SUBDIRS = . scanner repository offsets warn -+SUBDIRS = . scanner repository warn -+if BUILD_INTROSPECTION_DATA -+SUBDIRS += offsets -+endif - - EXTRA_DIST= - BUILT_SOURCES= diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch index 74622680d..26f8da6d4 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch @@ -1,4 +1,4 @@ -From 74dab0fb6104ab6b715a24b783f8e8dfa5f83617 Mon Sep 17 00:00:00 2001 +From 740d91151ffe576e0c08513af9d7bc8133eb9dfb Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 8 Oct 2015 18:30:35 +0300 Subject: [PATCH] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR @@ -11,64 +11,9 @@ Upstream-Status: Pending [review on oe-core list] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- - Makefile-gir.am | 18 +++++++++--------- - m4/introspection.m4 | 8 ++++---- - 2 files changed, 13 insertions(+), 13 deletions(-) + m4/introspection.m4 | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/Makefile-gir.am b/Makefile-gir.am -index b59b0a6..24a50c2 100644 ---- a/Makefile-gir.am -+++ b/Makefile-gir.am -@@ -58,8 +58,8 @@ else - endif - - # glib --GLIB_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0 --GLIB_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir glib-2.0) -+GLIB_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0 -+GLIB_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir glib-2.0) - - GLIB_LIBRARY=glib-2.0 - -@@ -95,8 +95,8 @@ GLib-2.0.gir: g-ir-scanner g-ir-compiler$(EXEEXT) - gir/DBusGLib-1.0.typelib: GObject-2.0.gir - - # gobject --GOBJECT_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0 --GOBJECT_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0) -+GOBJECT_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0 -+GOBJECT_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0) - - GOBJECT_LIBRARY=gobject-2.0 - -@@ -124,8 +124,8 @@ GObject_2_0_gir_FILES = \ - BUILT_GIRSOURCES += GObject-2.0.gir - - # gmodule --GMODULE_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0 --GMODULE_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0) -+GMODULE_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0 -+GMODULE_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0) - - GMODULE_LIBRARY=gmodule-2.0 - -@@ -150,13 +150,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \ - BUILT_GIRSOURCES += GModule-2.0.gir - - # gio --GIO_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0 --GIO_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0) -+GIO_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0 -+GIO_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0) - - GIO_LIBRARY=gio-2.0 - - if HAVE_GIO_UNIX --GIO_UNIX_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0 -+GIO_UNIX_INCLUDEDIR = $(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0 - GIO_UNIX_HDRS = $(wildcard $(GIO_UNIX_INCLUDEDIR)/gio/*.h) - GIO_UNIX_PACKAGES = gio-unix-2.0 - else diff --git a/m4/introspection.m4 b/m4/introspection.m4 index d89c3d9..b562266 100644 --- a/m4/introspection.m4 diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.2.bb b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb index f46053f44..c925115fb 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.2.bb +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb @@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ " SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ - file://0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch \ - file://0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch \ file://0003-giscanner-add-use-binary-wrapper-option.patch \ file://0004-giscanner-add-a-use-ldd-wrapper-option.patch \ file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \ @@ -21,8 +19,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$ file://0001-meson.build-disable-tests-when-cross-compiling.patch \ " -SRC_URI[md5sum] = "57c1c5dcf3d0a9aa73d06c2d5e6960d7" -SRC_URI[sha256sum] = "ffdfe2368fb2e34a547898b01aac0520d52d8627fdeb1c306559bcb503ab5e9c" +SRC_URI[md5sum] = "37278eab3704e42234b6080b8cf241f1" +SRC_URI[sha256sum] = "b1ee7ed257fdbc008702bdff0ff3e78a660e7e602efa8f211dc89b9d1e7d90a2" SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" diff --git a/poky/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch b/poky/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch index 8c9bc9544..5ca4e3e08 100644 --- a/poky/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +++ b/poky/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch @@ -1,4 +1,4 @@ -From 9537a7998a220b698b26d926a111bb400ff1ce01 Mon Sep 17 00:00:00 2001 +From 657310f3842c84d28f6b77e8ad4d9b93472ca5da Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Mon, 5 Sep 2016 22:25:44 +0100 Subject: [PATCH] Use native pkg-config when looking for gtk-doc. diff --git a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb index 4f97ce063..50d4d9972 100644 --- a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb +++ b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb @@ -18,8 +18,8 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation", PACKAGECONFIG[working-scripts] = ",,libxslt-native xmlto-native python3-six python3-pygments" PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0" -SRC_URI[archive.md5sum] = "6239713011369a4fbdc7619350403772" -SRC_URI[archive.sha256sum] = "a51687956d0377ac70904d03fdc73c9e116589b4a01453fa92162442b3657011" +SRC_URI[archive.md5sum] = "07764836262e154e94922e5f2aa476ae" +SRC_URI[archive.sha256sum] = "de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c" SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ file://conditionaltests.patch \ diff --git a/poky/meta/recipes-gnome/libdazzle/libdazzle_3.32.3.bb b/poky/meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb index e1a118300..cf61ed501 100644 --- a/poky/meta/recipes-gnome/libdazzle/libdazzle_3.32.3.bb +++ b/poky/meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb @@ -7,8 +7,8 @@ inherit gnomebase upstream-version-is-even vala distro_features_check gobject-in DEPENDS = "glib-2.0-native glib-2.0 gtk+3" -SRC_URI[archive.md5sum] = "b6da085649dcda2795e6980a84667950" -SRC_URI[archive.sha256sum] = "6c8d9b1514b5f6422107596f4145b89b8f2a99abef6383e086dfcd28c28667e8" +SRC_URI[archive.md5sum] = "e796a92dd3f529616ed388c15208359b" +SRC_URI[archive.sha256sum] = "3d981cbb9d9bb87bfaff7bfd44d9847223b3ef81e69225e4d1f6ac725a669505" GIR_MESON_OPTION = 'with_introspection' diff --git a/poky/meta/recipes-gnome/libsecret/libsecret_0.19.0.bb b/poky/meta/recipes-gnome/libsecret/libsecret_0.19.1.bb index 7da8e9008..0d7607523 100644 --- a/poky/meta/recipes-gnome/libsecret/libsecret_0.19.0.bb +++ b/poky/meta/recipes-gnome/libsecret/libsecret_0.19.1.bb @@ -8,8 +8,8 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native" PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" -SRC_URI[archive.md5sum] = "483d293e73e7257c6d9fc18579b0e1ea" -SRC_URI[archive.sha256sum] = "8049b09a4e737911aa647e50aee3d06b5db7aa902608ca43a0dd10d83e1d67f9" +SRC_URI[archive.md5sum] = "ea673119c00570d6434f8fd3636f1eb8" +SRC_URI[archive.sha256sum] = "8583e10179456ae2c83075d95455f156dc08db6278b32bf4bd61819335a30e3a" # http://errors.yoctoproject.org/Errors/Details/20228/ ARM_INSTRUCTION_SET_armv4 = "arm" diff --git a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.1.bb b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.1.bb index b0f565b9b..99cd4cd70 100644 --- a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.1.bb +++ b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.1.bb @@ -7,29 +7,30 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=e11f5c3149cdec4bb309babb020b32b9 \ file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc" -DEPENDS = "glib-2.0 cairo fontconfig freetype" - SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.xz" SRC_URI[md5sum] = "89b758a2eb14d56a94406cf914b62388" SRC_URI[sha256sum] = "c651fb3faaa338aeb280726837c2384064cdc17ef40539228d88a1260960844f" inherit autotools pkgconfig lib_package gtk-doc -PACKAGECONFIG ??= "icu" -PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu" +PACKAGECONFIG ??= "cairo fontconfig freetype glib icu" +PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo" +PACKAGECONFIG[fontconfig] = "--with-fontconfig,--without-fontconfig,fontconfig" +PACKAGECONFIG[freetype] = "--with-freetype,--without-freetype,freetype" +PACKAGECONFIG[glib] = "--with-glib,--without-glib,glib-2.0" PACKAGECONFIG[graphite] = "--with-graphite2,--without-graphite2,graphite2" - -EXTRA_OECONF = " \ - --with-cairo \ - --with-fontconfig \ - --with-freetype \ - --with-glib \ -" +PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu" PACKAGES =+ "${PN}-icu ${PN}-icu-dev" LEAD_SONAME = "libharfbuzz.so" +do_install_append() { + # If no tools are installed due to PACKAGECONFIG then this directory is + #still installed, so remove it to stop packaging wanings. + rmdir --ignore-fail-on-non-empty ${D}${bindir} +} + FILES_${PN}-icu = "${libdir}/libharfbuzz-icu.so.*" FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \ ${libdir}/libharfbuzz-icu.so \ diff --git a/poky/meta/recipes-graphics/pango/pango_1.44.6.bb b/poky/meta/recipes-graphics/pango/pango_1.44.6.bb index da7f2156d..8138ef72c 100644 --- a/poky/meta/recipes-graphics/pango/pango_1.44.6.bb +++ b/poky/meta/recipes-graphics/pango/pango_1.44.6.bb @@ -33,10 +33,8 @@ GTKDOC_MESON_OPTION = "gtk_doc" GIR_MESON_OPTION = 'introspection' LEAD_SONAME = "libpango-1.0*" -LIBV = "1.8.0" FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}" -FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" RDEPENDS_${PN}-ptest += "cantarell-fonts" RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-en-us" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb b/poky/meta/recipes-graphics/xorg-lib/libxfont2_2.0.4.bb index 6994d79e8..1c9cc0a21 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxfont2_2.0.4.bb @@ -15,8 +15,8 @@ XORG_PN = "libXfont2" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "b7ca87dfafeb5205b28a1e91ac3efe85" -SRC_URI[sha256sum] = "0e8ab7fd737ccdfe87e1f02b55f221f0bd4503a1c5f28be4ed6a54586bac9c4e" +SRC_URI[md5sum] = "00516bed7ec1453d56974560379fff2f" +SRC_URI[sha256sum] = "6d151b3368e5035efede4b6264c0fdc6662c1c99dbc2de425e3480cababc69e6" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb b/poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb index 57b202cae..64d829b31 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb @@ -10,7 +10,7 @@ pixmap format, which is commonly used in legacy X applications. XPM is \ an extension of the monochrome XBM bitmap specificied in the X \ protocol." -LICENSE = "BSD" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=51f4270b012ecd4ab1a164f5f4ed6cf7" DEPENDS += "libxext libsm libxt gettext-native" PE = "1" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 6ab1f8d3e..e3fe54441 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "04d5cfbbd09ba202134f97f8818372c7c9c81fe7" -SRCREV_meta ?= "56f5bc749e5a8e40b55a3819288ac277813ec5ef" +SRCREV_machine ?= "0a9f6ee2443b54c614107728ca76485916010023" +SRCREV_meta ?= "b867b78b5019ae455af97dec7794cff7527d7624" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index e6eb78198..f3f546866 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "e31887832108a1dfac19601459a84a2fa38207f7" -SRCREV_machine ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_meta ?= "56f5bc749e5a8e40b55a3819288ac277813ec5ef" +SRCREV_machine_qemuarm ?= "aaa66d462ec17345dadd69b1ec0f3fcc83e82536" +SRCREV_machine ?= "255a750d28cd45df8923c3aba1e82c322757a50d" +SRCREV_meta ?= "b867b78b5019ae455af97dec7794cff7527d7624" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 49b14b618..1a2c3ffcd 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "d956bb318771761069228fc70fea722ceabecb75" -SRCREV_machine_qemuarm64 ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_qemumips ?= "9e95334637a4a85b19bea120f9027ff0028d7069" -SRCREV_machine_qemuppc ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_qemuriscv64 ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_qemux86 ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_qemux86-64 ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_machine_qemumips64 ?= "29a8d126f60d1b9e9cf0985b38da2033ebde25db" -SRCREV_machine ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" -SRCREV_meta ?= "56f5bc749e5a8e40b55a3819288ac277813ec5ef" +SRCREV_machine_qemuarm ?= "47b80ef7bd932830f299ed76e2302df631ae4fbe" +SRCREV_machine_qemuarm64 ?= "255a750d28cd45df8923c3aba1e82c322757a50d" +SRCREV_machine_qemumips ?= "45ff64cb3f87c38db6f46353ea93005d049b0cf6" +SRCREV_machine_qemuppc ?= "255a750d28cd45df8923c3aba1e82c322757a50d" +SRCREV_machine_qemuriscv64 ?= "255a750d28cd45df8923c3aba1e82c322757a50d" +SRCREV_machine_qemux86 ?= "255a750d28cd45df8923c3aba1e82c322757a50d" +SRCREV_machine_qemux86-64 ?= "255a750d28cd45df8923c3aba1e82c322757a50d" +SRCREV_machine_qemumips64 ?= "ea0fd387a459803ac60e9b8a1729f2fc7d3215f1" +SRCREV_machine ?= "255a750d28cd45df8923c3aba1e82c322757a50d" +SRCREV_meta ?= "b867b78b5019ae455af97dec7794cff7527d7624" # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= "qemuarma15" diff --git a/poky/meta/recipes-multimedia/libogg/libogg_1.3.4.bb b/poky/meta/recipes-multimedia/libogg/libogg_1.3.4.bb index 8ca001079..c4004619b 100644 --- a/poky/meta/recipes-multimedia/libogg/libogg_1.3.4.bb +++ b/poky/meta/recipes-multimedia/libogg/libogg_1.3.4.bb @@ -5,7 +5,7 @@ necessary to codec libraries like libvorbis." HOMEPAGE = "http://xiph.org/" BUGTRACKER = "https://trac.xiph.org/newticket" SECTION = "libs" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=db1b7a668b2a6f47b2af88fb008ad555 \ file://include/ogg/ogg.h;beginline=1;endline=11;md5=eda812856f13a3b1326eb8f020cc3b0b" diff --git a/poky/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb b/poky/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb index 664d8480a..178e1a924 100644 --- a/poky/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb +++ b/poky/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The libtheora reference implementation provides the standard enco HOMEPAGE = "http://xiph.org/" BUGTRACKER = "https://trac.xiph.org/newticket" SECTION = "libs" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=cf91718f59eb6a83d06dc7bcaf411132" DEPENDS = "libogg" diff --git a/poky/meta/recipes-multimedia/libvorbis/libvorbis_1.3.6.bb b/poky/meta/recipes-multimedia/libvorbis/libvorbis_1.3.6.bb index cbda6dc2f..1a3cdc226 100644 --- a/poky/meta/recipes-multimedia/libvorbis/libvorbis_1.3.6.bb +++ b/poky/meta/recipes-multimedia/libvorbis/libvorbis_1.3.6.bb @@ -5,7 +5,7 @@ is the main vorbis codec library." HOMEPAGE = "http://www.vorbis.com/" BUGTRACKER = "https://trac.xiph.org" SECTION = "libs" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=70c7063491d2d9f76a098d62ed5134f1 \ file://include/vorbis/vorbisenc.h;beginline=1;endline=11;md5=d1c1d138863d6315131193d4046d81cb" DEPENDS = "libogg" diff --git a/poky/meta/recipes-multimedia/mpg123/mpg123_1.25.11.bb b/poky/meta/recipes-multimedia/mpg123/mpg123_1.25.12.bb index d063ef5c5..a18b2f441 100644 --- a/poky/meta/recipes-multimedia/mpg123/mpg123_1.25.11.bb +++ b/poky/meta/recipes-multimedia/mpg123/mpg123_1.25.12.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3" SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2 \ file://sdl2.patch" -SRC_URI[md5sum] = "64749512a6fdc117227abe13fee4cc36" -SRC_URI[sha256sum] = "df063307faa27c7d9efe63d2139b1564cfc7cdbb7c6f449c89ef8faabfa0eab2" +SRC_URI[md5sum] = "ddb38254966eb38c77f220d456a1839d" +SRC_URI[sha256sum] = "1ffec7c9683dfb86ea9040d6a53d6ea819ecdda215df347f79def08f1fe731d1" inherit autotools pkgconfig diff --git a/poky/meta/recipes-multimedia/speex/speex_1.2.0.bb b/poky/meta/recipes-multimedia/speex/speex_1.2.0.bb index 19636bb20..3a0911d6f 100644 --- a/poky/meta/recipes-multimedia/speex/speex_1.2.0.bb +++ b/poky/meta/recipes-multimedia/speex/speex_1.2.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Speech Audio Codec" DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech." HOMEPAGE = "http://www.speex.org" SECTION = "libs" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8 \ file://include/speex/speex.h;beginline=1;endline=34;md5=ef8c8ea4f7198d71cf3509c6ed05ea50" DEPENDS = "libogg speexdsp" diff --git a/poky/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb b/poky/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb index 6b1acedbe..03c949be2 100644 --- a/poky/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb +++ b/poky/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb @@ -2,7 +2,7 @@ SUMMARY = "A patent-free DSP library" DESCRIPTION = "SpeexDSP is a patent-free, Open Source/Free Software DSP library." HOMEPAGE = "http://www.speex.org" SECTION = "libs" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8" SRC_URI = "http://downloads.xiph.org/releases/speex/speexdsp-${PV}.tar.gz \ diff --git a/poky/meta/recipes-multimedia/webp/libwebp_1.0.3.bb b/poky/meta/recipes-multimedia/webp/libwebp_1.0.3.bb index a4d1ae43d..5082bf037 100644 --- a/poky/meta/recipes-multimedia/webp/libwebp_1.0.3.bb +++ b/poky/meta/recipes-multimedia/webp/libwebp_1.0.3.bb @@ -9,7 +9,7 @@ DESCRIPTION = "WebP is a method of lossy and lossless compression that can be \ HOMEPAGE = "https://developers.google.com/speed/webp/" SECTION = "libs" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb \ file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7" diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch deleted file mode 100644 index e71905d26..000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch +++ /dev/null @@ -1,125 +0,0 @@ -From d1634e56a2589ec62325011bf77d480a67123b52 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 17 Apr 2016 12:35:41 -0700 -Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem - -gcc-6 has now introduced stdlib.h in libstdc++ for better -compliance and its including the C library stdlib.h using -include_next which is sensitive to order of system header -include paths. Its infact better to not tinker with the -system header include paths at all. Since adding /usr/include -to -system is redundant and compiler knows about it moreover -now with gcc6 it interferes with compiler's functioning -and ends up with compile errors e.g. - -/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending - ---- - Source/JavaScriptCore/shell/CMakeLists.txt | 2 +- - Source/WebCore/PlatformGTK.cmake | 6 +++--- - Source/WebKit/PlatformGTK.cmake | 2 +- - Source/cmake/WebKitMacros.cmake | 2 +- - Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +- - Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +- - 6 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt -index 87153e35..cd0beed4 100644 ---- a/Source/JavaScriptCore/shell/CMakeLists.txt -+++ b/Source/JavaScriptCore/shell/CMakeLists.txt -@@ -36,7 +36,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() - WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) - WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES}) - include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) - add_executable(jsc ${JSC_SOURCES}) - target_link_libraries(jsc ${JSC_LIBRARIES}) - -diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake -index e0dd9cd9..a2997f3e 100644 ---- a/Source/WebCore/PlatformGTK.cmake -+++ b/Source/WebCore/PlatformGTK.cmake -@@ -164,7 +164,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) - target_include_directories(WebCorePlatformGTK2 PRIVATE - ${WebCore_INCLUDE_DIRECTORIES} - ) -- target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE -+ target_include_directories(WebCorePlatformGTK2 PRIVATE - ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} - ${GTK2_INCLUDE_DIRS} - ${GDK2_INCLUDE_DIRS} -@@ -190,7 +190,7 @@ add_dependencies(WebCorePlatformGTK WebCore) - target_include_directories(WebCorePlatformGTK PRIVATE - ${WebCore_INCLUDE_DIRECTORIES} - ) --target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE -+target_include_directories(WebCorePlatformGTK PRIVATE - ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} - ${GTK_INCLUDE_DIRS} - ${GDK_INCLUDE_DIRS} -@@ -206,7 +206,7 @@ include_directories( - "${WEBCORE_DIR}/bindings/gobject/" - ) - --include_directories(SYSTEM -+include_directories( - ${WebCore_SYSTEM_INCLUDE_DIRECTORIES} - ) - -diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index 693bbdfe..20e3802f 100644 ---- a/Source/WebKit/PlatformGTK.cmake -+++ b/Source/WebKit/PlatformGTK.cmake -@@ -664,7 +664,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) - target_include_directories(WebKitPluginProcess2 PRIVATE - ${WebKitCommonIncludeDirectories} - ) -- target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE -+ target_include_directories(WebKitPluginProcess2 PRIVATE - ${WebKitCommonSystemIncludeDirectories} - ${GTK2_INCLUDE_DIRS} - ${GDK2_INCLUDE_DIRS} -diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake -index 6d58d57e..976e2362 100644 ---- a/Source/cmake/WebKitMacros.cmake -+++ b/Source/cmake/WebKitMacros.cmake -@@ -152,7 +152,7 @@ macro(WEBKIT_FRAMEWORK _target) - ${${_target}_SOURCES} - ) - target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>") -- target_include_directories(${_target} SYSTEM PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>") -+ target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>") - target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_PRIVATE_INCLUDE_DIRECTORIES}>") - target_link_libraries(${_target} ${${_target}_LIBRARIES}) - set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}") -diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt -index a0d32059..f259ade2 100644 ---- a/Tools/MiniBrowser/gtk/CMakeLists.txt -+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt -@@ -59,7 +59,7 @@ endif () - add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) - - include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) - add_executable(MiniBrowser ${MiniBrowser_SOURCES}) - target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) - -diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake -index 8dd0e146..d037fc35 100644 ---- a/Tools/TestWebKitAPI/PlatformGTK.cmake -+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake -@@ -22,7 +22,7 @@ include_directories( - ${WEBKIT_DIR}/UIProcess/API/gtk - ) - --include_directories(SYSTEM -+include_directories( - ${GDK3_INCLUDE_DIRS} - ${GLIB_INCLUDE_DIRS} - ${GSTREAMER_INCLUDE_DIRS} diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch deleted file mode 100644 index bd4ac1e35..000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2d9687840b97186b80053dd262209e39455ac876 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 8 May 2019 15:31:23 +0200 -Subject: [PATCH] gstreamer: add a missing format string - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - .../platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp -index e1e497ee..483fd65c 100644 ---- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp -+++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp -@@ -738,7 +738,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat - WebKitWebSrc* src = WEBKIT_WEB_SRC(element); - - #if GST_CHECK_VERSION(1, 14, 0) -- GST_DEBUG_OBJECT(src, gst_state_change_get_name(transition)); -+ GST_DEBUG_OBJECT(src, "%s", gst_state_change_get_name(transition)); - #endif - switch (transition) { - case GST_STATE_CHANGE_READY_TO_NULL: diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch b/poky/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch deleted file mode 100644 index 57ae48c14..000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Alberto Garcia <berto@igalia.com> -Subject: Disable USE_GSTREAMER_GL is the package is not found -Forwarded: no -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: webkitgtk/Source/cmake/GStreamerChecks.cmake -=================================================================== ---- webkitgtk.orig/Source/cmake/GStreamerChecks.cmake -+++ webkitgtk/Source/cmake/GStreamerChecks.cmake -@@ -43,7 +43,8 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO) - message(FATAL_ERROR "GStreamer 1.10 is needed for USE_GSTREAMER_GL.") - else () - if (NOT PC_GSTREAMER_GL_FOUND) -- message(FATAL_ERROR "GStreamerGL is needed for USE_GSTREAMER_GL.") -+ set(USE_GSTREAMER_GL OFF) -+ message(STATUS "GStreamerGL is needed for USE_GSTREAMER_GL.") - endif () - endif () - endif () diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/narrowing.patch b/poky/meta/recipes-sato/webkit/webkitgtk/narrowing.patch deleted file mode 100644 index 598b6b5df..000000000 --- a/poky/meta/recipes-sato/webkit/webkitgtk/narrowing.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix build with clang on arm where char is unsigned - -Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197087] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- a/Source/WebCore/contentextensions/DFACombiner.cpp -+++ b/Source/WebCore/contentextensions/DFACombiner.cpp -@@ -37,7 +37,7 @@ namespace WebCore { - namespace ContentExtensions { - - class DFAMerger { -- typedef MutableRangeList<char, uint64_t, 128> CombinedTransitionsMutableRangeList; -+ typedef MutableRangeList<signed char, uint64_t, 128> CombinedTransitionsMutableRangeList; - - enum class WhichDFA { - A, ---- a/Source/WebCore/contentextensions/NFAToDFA.cpp -+++ b/Source/WebCore/contentextensions/NFAToDFA.cpp -@@ -41,9 +41,9 @@ namespace WebCore { - - namespace ContentExtensions { - --typedef MutableRange<char, NFANodeIndexSet> NFANodeRange; --typedef MutableRangeList<char, NFANodeIndexSet> NFANodeRangeList; --typedef MutableRangeList<char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList; -+typedef MutableRange<signed char, NFANodeIndexSet> NFANodeRange; -+typedef MutableRangeList<signed char, NFANodeIndexSet> NFANodeRangeList; -+typedef MutableRangeList<signed char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList; - typedef Vector<uint32_t, 0, ContentExtensionsOverflowHandler> UniqueNodeList; - typedef Vector<UniqueNodeList, 0, ContentExtensionsOverflowHandler> NFANodeClosures; - diff --git a/poky/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.26.1.bb index 8c695ce9e..77e51e7d2 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb +++ b/poky/meta/recipes-sato/webkit/webkitgtk_2.26.1.bb @@ -17,16 +17,12 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ file://x32_support.patch \ file://cross-compile.patch \ - file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ file://0001-Fix-build-with-musl.patch \ - file://detect-gstreamer-gl.patch \ file://include_array.patch \ - file://narrowing.patch \ - file://0001-gstreamer-add-a-missing-format-string.patch \ " -SRC_URI[md5sum] = "c214963d8c0e7d83460da04a0d8dda87" -SRC_URI[sha256sum] = "8668b129c026624ec226a4cccf4995f9d26f3e88fc28ab75b0e965f3c32b7dd8" +SRC_URI[md5sum] = "08145bd6c1587230f135921c142bc150" +SRC_URI[sha256sum] = "6b4b21801d2b1008422a1075dbd6fb4ae8b5127503faf657cf9671289d9cd155" inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc @@ -69,6 +65,7 @@ EXTRA_OECMAKE = " \ ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \ -DENABLE_MINIBROWSER=ON \ -DPYTHON_EXECUTABLE=`which python3` \ + -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ " # Javascript JIT is not supported on ARC diff --git a/poky/meta/recipes-support/fribidi/fribidi/meson.patch b/poky/meta/recipes-support/fribidi/fribidi/meson.patch deleted file mode 100644 index 8b3c4a991..000000000 --- a/poky/meta/recipes-support/fribidi/fribidi/meson.patch +++ /dev/null @@ -1,44 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From f5feb6c599adb52f24656f8589868039b0d14272 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <heirecka@exherbo.org> -Date: Fri, 7 Sep 2018 20:57:11 +0200 -Subject: [PATCH] Build generator executables natively - -They are run during the build and not installed in the end. Without -this one gets the following error from meson: "ERROR: Can not use -target gen-unicode-version as a generator because it is cross-built -and no exe wrapper is defined. You might want to set it to native -instead." - -Closes #87. - ---- - gen.tab/meson.build | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/gen.tab/meson.build b/gen.tab/meson.build -index 6006d98..8c21e98 100644 ---- a/gen.tab/meson.build -+++ b/gen.tab/meson.build -@@ -33,7 +33,8 @@ gen_unicode_version = executable('gen-unicode-version', - 'gen-unicode-version.c', - include_directories: incs, - c_args: native_args, -- install: false) -+ install: false, -+ native: true) - - fribidi_unicode_version_h = custom_target('fribidi-unicode-version.h', - input: files('unidata/ReadMe.txt', 'unidata/BidiMirroring.txt'), -@@ -67,7 +68,8 @@ foreach tab : tabs - gen_prog_src, 'packtab.c', - include_directories: incs, - c_args: native_args, -- install: false) -+ install: false, -+ native: true) - - tab_inc_file = custom_target(gen_prog_name, - input: gen_prog_inputs, diff --git a/poky/meta/recipes-support/fribidi/fribidi_1.0.5.bb b/poky/meta/recipes-support/fribidi/fribidi_1.0.7.bb index 63b2da649..673888401 100644 --- a/poky/meta/recipes-support/fribidi/fribidi_1.0.5.bb +++ b/poky/meta/recipes-support/fribidi/fribidi_1.0.7.bb @@ -4,9 +4,9 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ - file://meson.patch" -SRC_URI[md5sum] = "0f97f65038545340316ec0f4bd53df0b" -SRC_URI[sha256sum] = "6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce" + " +SRC_URI[md5sum] = "4c020b0f5136dd012ee00f1e1122f6aa" +SRC_URI[sha256sum] = "5ab5f21e9f2fc57b4b40f8ea8f14dba78a5cc46d9cf94bc5e00a58e6886a935d" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" diff --git a/poky/meta/recipes-support/iso-codes/iso-codes_4.3.bb b/poky/meta/recipes-support/iso-codes/iso-codes_4.4.bb index 5651a96c6..332af025d 100644 --- a/poky/meta/recipes-support/iso-codes/iso-codes_4.3.bb +++ b/poky/meta/recipes-support/iso-codes/iso-codes_4.4.bb @@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://salsa.debian.org/iso-codes-team/iso-codes.git;protocol=http" -SRCREV = "43398a317371e309361ce43072603863cb2f57e1" +SRCREV = "38edb926592954b87eb527124da0ec68d2a748f3" # inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which # are inhibited by allarch diff --git a/poky/meta/recipes-support/libcap/libcap_2.27.bb b/poky/meta/recipes-support/libcap/libcap_2.27.bb index 4f3bac849..3f64ff763 100644 --- a/poky/meta/recipes-support/libcap/libcap_2.27.bb +++ b/poky/meta/recipes-support/libcap/libcap_2.27.bb @@ -13,6 +13,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${ SRC_URI[md5sum] = "2e8f9fab32eb5ccb37969fe317fd17aa" SRC_URI[sha256sum] = "dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a" +UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" + inherit lib_package # do NOT pass target cflags to host compilations diff --git a/poky/meta/recipes-support/libcheck/libcheck_0.12.0.bb b/poky/meta/recipes-support/libcheck/libcheck_0.12.0.bb index 94b0dc1bb..25ac2c4b2 100644 --- a/poky/meta/recipes-support/libcheck/libcheck_0.12.0.bb +++ b/poky/meta/recipes-support/libcheck/libcheck_0.12.0.bb @@ -18,7 +18,12 @@ inherit autotools pkgconfig texinfo CACHED_CONFIGUREVARS += "ac_cv_path_AWK_PATH=${bindir}/gawk" RREPLACES_${PN} = "check (<= 0.9.5)" -RDEPENDS_${PN} += "gawk" -RDEPENDS_${PN}_class-native = "" BBCLASSEXTEND = "native nativesdk" + +PACKAGES =+ "checkmk" + +FILES_checkmk = "${bindir}/checkmk" + +RDEPENDS_checkmk = "gawk" + diff --git a/poky/meta/recipes-support/libpcre/libpcre2_10.33.bb b/poky/meta/recipes-support/libpcre/libpcre2_10.33.bb index 50b26753b..87da31376 100644 --- a/poky/meta/recipes-support/libpcre/libpcre2_10.33.bb +++ b/poky/meta/recipes-support/libpcre/libpcre2_10.33.bb @@ -7,7 +7,7 @@ not the original PCRE 8.x series." SUMMARY = "Perl Compatible Regular Expressions version 2" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE;md5=b1588d3bb4cb0e1f5a597d908f8c5b37" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \ diff --git a/poky/meta/recipes-support/libpcre/libpcre_8.43.bb b/poky/meta/recipes-support/libpcre/libpcre_8.43.bb index b97af08b2..f9a22fee9 100644 --- a/poky/meta/recipes-support/libpcre/libpcre_8.43.bb +++ b/poky/meta/recipes-support/libpcre/libpcre_8.43.bb @@ -5,7 +5,7 @@ to the POSIX regular expression API." SUMMARY = "Perl Compatible Regular Expressions" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE;md5=91bee59d1b327eb1599b4c673e2fb3d1" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ file://fix-pcre-name-collision.patch \ diff --git a/poky/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch b/poky/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch deleted file mode 100644 index e902b0b52..000000000 --- a/poky/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c6bb4b99af39daa3221c3bdc0686987ae0f31693 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 31 Jan 2018 16:47:44 +0200 -Subject: [PATCH] LINGUAS: drop the languages for which upstream does not - supply .po files - -Regenerating them proved to be too painful. -Upstream has been notified: https://github.com/p11-glue/p11-kit/issues/127 - -Upstream-Status: Inappropriate [missing upstream distribution files] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - po/LINGUAS | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/po/LINGUAS b/po/LINGUAS -index 767a806c2e20..6ab48001c409 100644 ---- a/po/LINGUAS -+++ b/po/LINGUAS -@@ -12,8 +12,6 @@ cy - da - de - el --en@boldquot --en@quot - en_GB - eo - es diff --git a/poky/meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb b/poky/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb index 54455da1b..9193a06ea 100644 --- a/poky/meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb +++ b/poky/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb @@ -1,15 +1,13 @@ SUMMARY = "Provides a way to load and enumerate PKCS#11 modules" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50" inherit autotools gettext pkgconfig gtk-doc DEPENDS = "libtasn1 libffi" -SRC_URI = "git://github.com/p11-glue/p11-kit \ - file://0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch \ - " -SRCREV = "c689917b393379d288b868f70b2f7b7f6aafe430" +SRC_URI = "git://github.com/p11-glue/p11-kit" +SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6" S = "${WORKDIR}/git" AUTOTOOLS_AUXDIR = "${S}/build/litter" diff --git a/poky/meta/recipes-support/sqlite/sqlite3_3.29.0.bb b/poky/meta/recipes-support/sqlite/sqlite3_3.30.0.bb index 07e36bede..feeee8af0 100644 --- a/poky/meta/recipes-support/sqlite/sqlite3_3.29.0.bb +++ b/poky/meta/recipes-support/sqlite/sqlite3_3.30.0.bb @@ -4,5 +4,5 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" SRC_URI = "http://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_PV}.tar.gz" -SRC_URI[md5sum] = "8f3dfe83387e62ecb91c7c5c09c688dc" -SRC_URI[sha256sum] = "8e7c1e2950b5b04c5944a981cb31fffbf9d2ddda939d536838ebc854481afd5b" +SRC_URI[md5sum] = "84230638d5b80b61843e43b5efcb9e53" +SRC_URI[sha256sum] = "e0a8cf4c7a87455e55e10413d16f358ca121ccec687fe1301eac95e2d340fc58" diff --git a/poky/scripts/gen-lockedsig-cache b/poky/scripts/gen-lockedsig-cache index 48cb67112..9bfae9d83 100755 --- a/poky/scripts/gen-lockedsig-cache +++ b/poky/scripts/gen-lockedsig-cache @@ -24,6 +24,8 @@ def extract_sha(filename): # a map from hash to list of file with that hash def map_sha_to_files(dir_, prefix, sha_map): sstate_prefix_path = dir_ + '/' + prefix + '/' + if not os.path.exists(sstate_prefix_path): + return sstate_files = os.listdir(sstate_prefix_path) for f in sstate_files: try: diff --git a/poky/scripts/lib/devtool/standard.py b/poky/scripts/lib/devtool/standard.py index 60c9a046f..1646971a9 100644 --- a/poky/scripts/lib/devtool/standard.py +++ b/poky/scripts/lib/devtool/standard.py @@ -2011,7 +2011,7 @@ def finish(args, config, basepath, workspace): no_clean = args.no_clean tinfoil = setup_tinfoil(basepath=basepath, tracking=True) try: - rd = parse_recipe(config, tinfoil, args.recipename, True) + rd = parse_recipe(config, tinfoil, args.recipename, True, False) if not rd: return 1 diff --git a/poky/scripts/lib/wic/plugins/imager/direct.py b/poky/scripts/lib/wic/plugins/imager/direct.py index 3ce6ad55b..2441cc33a 100644 --- a/poky/scripts/lib/wic/plugins/imager/direct.py +++ b/poky/scripts/lib/wic/plugins/imager/direct.py @@ -316,6 +316,7 @@ class PartitionedImage(): # Size of a sector used in calculations self.sector_size = SECTOR_SIZE self.native_sysroot = native_sysroot + num_real_partitions = len([p for p in self.partitions if not p.no_table]) # calculate the real partition number, accounting for partitions not # in the partition table and logical partitions @@ -325,7 +326,7 @@ class PartitionedImage(): part.realnum = 0 else: realnum += 1 - if self.ptable_format == 'msdos' and realnum > 3 and len(partitions) > 4: + if self.ptable_format == 'msdos' and realnum > 3 and num_real_partitions > 4: part.realnum = realnum + 1 continue part.realnum = realnum diff --git a/poky/scripts/runqemu b/poky/scripts/runqemu index 1a5aca98a..a05facd0d 100755 --- a/poky/scripts/runqemu +++ b/poky/scripts/runqemu @@ -457,6 +457,7 @@ class BaseConfig(object): del os.environ['PKG_CONFIG_PATH'] del os.environ['PKG_CONFIG_DIR'] del os.environ['PKG_CONFIG_LIBDIR'] + del os.environ['PKG_CONFIG_SYSROOT_DIR'] except KeyError: pass try: @@ -1197,12 +1198,12 @@ class BaseConfig(object): # All branches above set vm_drive. self.rootfs_options = '%s -no-reboot' % vm_drive - self.kernel_cmdline = 'root=%s rw highres=off' % (self.get('QB_KERNEL_ROOT')) + self.kernel_cmdline = 'root=%s rw' % (self.get('QB_KERNEL_ROOT')) if self.fstype == 'nfs': self.rootfs_options = '' k_root = '/dev/nfs nfsroot=%s:%s,%s' % (self.nfs_server, os.path.abspath(self.rootfs), self.unfs_opts) - self.kernel_cmdline = 'root=%s rw highres=off' % k_root + self.kernel_cmdline = 'root=%s rw' % k_root if self.fstype == 'none': self.rootfs_options = '' |
