Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update DSM6 default version from 6.1 to 6.2.4 due to toolchain removals #5765

Merged
merged 5 commits into from
Jun 12, 2023

Conversation

th0ma7
Copy link
Contributor

@th0ma7 th0ma7 commented Jun 3, 2023

Description

Update DSM6 default version from 6.1 to 6.2.4 due to toolchain removals

Fixes n/a

Checklist

  • Build rule all-supported completed successfully
  • New installation of package completed successfully
  • Package upgrade completed successfully (Manually install the package again)
  • Package functionality was tested
  • Any needed documentation is updated/created

Type of change

  • Bug fix
  • New Package
  • Package update
  • Includes small framework changes
  • This change requires a documentation update (e.g. Wiki)

@th0ma7 th0ma7 requested a review from hgy59 June 3, 2023 13:33
@th0ma7 th0ma7 self-assigned this Jun 3, 2023
@hgy59
Copy link
Contributor

hgy59 commented Jun 7, 2023

@th0ma7 at first sight, we need to add all patches we created for 6.1 toolchains to the 6.2.4 toolchains.

So far this are

  • toolchain/syno-aarch64-6.1/patches/define_scsi_ioctl_tagged_enable_disable.patch
  • toolchain/syno-evansport-6.1/patches/define_scsi_ioctl_tagged_enable_disable.patch
  • toolchain/syno-x64-6.1/patches/define_scsi_ioctl_tagged_enable_disable.patch

EDIT: this is fixed now

.github/workflows/build.yml Outdated Show resolved Hide resolved
@hgy59 hgy59 added the framework label Jun 7, 2023
hgy59 added 2 commits June 7, 2023 22:06
- add define_scsi_ioctl_tagged_enable_disable.patch
Copy link
Contributor

@hgy59 hgy59 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

don't forget to revert the umurmur/Makefile change

@th0ma7
Copy link
Contributor Author

th0ma7 commented Jun 8, 2023

Thnx for the review and good catch. I should find cycles by the weekend to undo umurmur and merge. Feel free to take it over if there is a rush to merge to fix things.

@hgy59 One thing that cones to mind, is the web publishing portion able to handle 3 digit versions? If i recall that had been fixed but that was a while back either by @ymartin59 or @publicarray , unsure.

Anyhow, well know soon enough...

@hgy59
Copy link
Contributor

hgy59 commented Jun 8, 2023

@hgy59 One thing that cones to mind, is the web publishing portion able to handle 3 digit versions? If i recall that had been fixed but that was a while back either by @ymartin59 or @publicarray , unsure.

@th0ma7 a very good catch.
I tried with umurmur to publish 6.2.4 and it fails with "Unknown firmware".
I only had to add firmware 6.2 with build number 25556 in the repo DB for the publish to work.
The os__min_ver is already "6.2-25556" in the INFO file, so the repo still works with two digit TC-Versions.

@th0ma7
Copy link
Contributor Author

th0ma7 commented Jun 8, 2023

Awesome. I now recall a change in the code to adapt the version number to always be using two digit with the corresponding 3 digit firmware build number.

@hgy59
Copy link
Contributor

hgy59 commented Jun 8, 2023

Awesome. I now recall a change in the code to adapt the version number to always be using two digit with the corresponding 3 digit firmware build number.

@th0ma7 this code is already there (in spksrc.tc-flags.mk)

ifeq ($(strip $(TC_OS_MIN_VER)),)
TC_OS_MIN_VER = $(word 1,$(subst ., ,$(TC_VERS))).$(word 2,$(subst ., ,$(TC_VERS)))-$(TC_BUILD)
endif

or did I miss something?

@hgy59
Copy link
Contributor

hgy59 commented Jun 8, 2023

@th0ma7 the toolchains for SRM-1.2 are removed too.
But the SRM 1.3 toolchains are still missing (demanded here #5402)

@th0ma7
Copy link
Contributor Author

th0ma7 commented Jun 9, 2023

this code is already there (in spksrc.tc-flags.mk)

ifeq ($(strip $(TC_OS_MIN_VER)),)
TC_OS_MIN_VER = $(word 1,$(subst ., ,$(TC_VERS))).$(word 2,$(subst ., ,$(TC_VERS)))-$(TC_BUILD)
endif

or did I miss something?

@hgy59 nope, didn't miss anything. It may even be actually me who wrote that... :)

@hgy59
Copy link
Contributor

hgy59 commented Jun 12, 2023

@th0ma7 can we merge this?

@th0ma7 th0ma7 merged commit 2f9d7bd into SynoCommunity:master Jun 12, 2023
@th0ma7 th0ma7 deleted the update-dsm-624 branch June 12, 2023 23:28
@th0ma7
Copy link
Contributor Author

th0ma7 commented Jun 12, 2023

@hgy59 now merged, thnx for the reminder.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants