-
Notifications
You must be signed in to change notification settings - Fork 12
Adaptations to get xorg and weston running on x86 #133
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
base: master
Are you sure you want to change the base?
Conversation
The tools should usually be named like the recipe.
Some packages will use the fontutil.pc file to get the font root directory. As pc files are relocated in Bob, the value must be hard coded path. Interestingly, pkg-config has a heuristic that detects if variables start with the same string as the "prefix" variable. But we only want the include and library directories to be relocated. To work around this problem, use a dummy prefix. It will be overwritten anyway by the actual pc file location. On the other hand, the "mapdir" path must be relocated. It is used to find the mapping data at runtime when the tools are invoked. This is at cross-compile time of other packages. At the same time, the ...
Some packages will use the xkbcomp.pc file to get the X11 keymaps directory. As pc files are relocated in Bob, the value must be hard coded path. Interestingly, pkg-config has a heuristic that detects if variables start with the same string as the "prefix" variable. But we only want the include and library directories to be relocated. To work around this problem, use a dummy prefix. It will be overwritten anyway by the actual pc file location.
Some packages will use the xcursor.pc file to get the icons directory. As pc files are relocated in Bob, the value must be hard coded path. Interestingly, pkg-config has a heuristic that detects if variables start with the same string as the "prefix" variable. But we only want the include and library directories to be relocated. To work around this problem, use a dummy prefix. It will be overwritten anyway by the actual pc file location.
The mesa3d library does not have any applications. Remove the libs::mesa3d package because it just holds a configuration file. Install it with the libraries directly instead.
Some packages will use the dri.pc file to get the DRI drivers directory. As pc files are relocated in Bob, the value must be hard coded path. Interestingly, pkg-config has a heuristic that detects if variables start with the same string as the "prefix" variable. But we only want the include and library directories to be relocated. To work around this problem, use a dummy prefix. It will be overwritten anyway by the actual pc file location.
Some packages may use the gbm.pc file to get the GBM drivers directory. As pc files are relocated in Bob, the value must be hard coded path. Interestingly, pkg-config has a heuristic that detects if variables start with the same string as the "prefix" variable. But we only want the include and library directories to be relocated. To work around this problem, use a dummy prefix. It will be overwritten anyway by the actual pc file location.
A helper to create an xauth cookie. It comes with no apparent version and is public domain.
The font-utils package produces only two executables with some development meta data. It's used by other packages to process font data at compile time. In particular, it is *not* a library. Hence, it makes no sense to have a -dev and -tgt multiPackage. Because some packages require pkg-config to find the font-util binaries, add a class that adds the tool to the pkg-config search path.
The xserver won't work without xkeyboard-config files. Add the package as a standard runtime dependency because there is no sane configuration with xserver where those are not needed.
Centrally define the allowed values of CONFIG_INIT. Ensures consistency between recipes that are dependent on the init system.
The data- and sysconf-directories were set to inconsistent values. This had the effect that files provided by other packages for dbus were not picked up. Consequently, the services would not run. Remove the options and use the default values as expected by other packages.
The dbus-dev package contains only libdbus-1.so. Consequently, the dbus-tgt package should only hold the shared library as well. If the dbus daemon is to be installed on the target, it must be selected explicitly by the core::dbus package.
If the x11 platform is not selected, the "glx" switch must be disabled. Do this in the recipe because so that the user of the recipe does not have to bother.
This is a good default when building for x11. When building for wayland, the switch is forced to "disabled" by the build script, so its value does not matter.
The setup of the XDG_RUNTIME_DIR variable is only necessary on sysvinit based systems. On systemd, the variable will have the correct setting already.
72c1d7c to
637dbb9
Compare
|
Looks good to me. The only small issue is that you define the initIsSystemd helper after some commits using it already. But I guess this doesn't matter anyway, because it gets merged in one go. |
rhubert
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
Thanks for adding the font stuff. I also have this on my side bit it looks quiet identical.
| [[ ${CONFIG_INIT:-} == "sysvinit" ]] || initIsSysvinitSysv || initIsSysvinitBusybox | ||
| } | ||
| # Check is the init system is systemd |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| # Check is the init system is systemd | |
| # Check if the init system is systemd |
| usr/lib/pkgconfig/fontutil.pc | ||
| provideTools: | ||
| font-util: "usr/bin" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we really need to rename this? :/
I'm creating some Linux blueprint recipes that showcase how to build a "standard" Linux with Bob. I needed quite a lot of changes to get this running.
@rhubert @sixtyfourktec Please have a look. There are probably some breaking in there:
I really would like to hear your feedback before merging this. I hope that I'll post the Linux blueprint in the next days as well...