Skip to content

Make /etc/os-release optional#538

Open
TobiPeterG wants to merge 1 commit intoDisplayLink:mainfrom
TobiPeterG:main
Open

Make /etc/os-release optional#538
TobiPeterG wants to merge 1 commit intoDisplayLink:mainfrom
TobiPeterG:main

Conversation

@TobiPeterG
Copy link
Copy Markdown

This change makes the /etc/os-release include in the Makefile optional. Without it, the build fails on systems that don't have it, e.g. minimalistic chroot environments where evdi is built as in-tree module.

Copy link
Copy Markdown
Contributor

@elguero elguero left a comment

Choose a reason for hiding this comment

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

This PR needs to be brought up to date with the latest changes.

If you could rebase and then address the comments, we should be in a good spot.

Comment thread module/Makefile

include /etc/os-release
ifneq ($(wildcard /etc/os-release),)
-include /etc/os-release
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Since you are doing the check above for the existence of the os-release file, then you don't need the - before the include. I mean, no harm, it is just redundant.

Comment thread module/Makefile

ifneq (,$(findstring rhel,$(ID_LIKE)))
ELFLAG := -DEL$(VERSION_ID)
ifneq (,$(VERSION_ID))
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why are we adding a check for $VERSION_ID? If ID_LIKE is not set because there is no os-release file, then this block would be skipped anyways.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants