diff --git a/developer/building/development-workflow.md b/developer/building/development-workflow.md index e9ca27bc..0ec9fd95 100644 --- a/developer/building/development-workflow.md +++ b/developer/building/development-workflow.md @@ -117,7 +117,7 @@ cd ../.. vi series.conf ~~~ -#### Building RPMS +#### Building RPMs TODO: Is this step generic for all subsystems? @@ -130,13 +130,13 @@ distinguish between different versions of the same package. You might want to take a moment here to review (git diff, git status), commit your changes locally. -To actually build RPMS, in qubes-builder: +To actually build RPMs, in qubes-builder: ~~~ make linux-kernel ~~~ -RPMS will appear in qubes-src/linux-kernel/pkgs/fc20/x86\_64: +RPMs will appear in qubes-src/linux-kernel/pkgs/fc20/x86\_64: ~~~ -rw-rw-r-- 1 user user 42996126 Nov 17 04:08 kernel-3.4.18-1debug20121116c.pvops.qubes.x86_64.rpm @@ -166,7 +166,7 @@ FETCH_HEAD` (in each repo directory). Or `make do-merge` to merge all of them. When developing it is convenient to be able to rapidly test changes. Assuming you're developing Qubes on Qubes, you should be working in a special VM for -Qubes and occasionally you will want to transfer code or rpms back to dom0 for +Qubes and occasionally you will want to transfer code or RPMs back to dom0 for testing. Here are some handy scripts Marek has shared to facilitate this. diff --git a/developer/building/qubes-builder.md b/developer/building/qubes-builder.md index b4353ff8..939cbb26 100644 --- a/developer/building/qubes-builder.md +++ b/developer/building/qubes-builder.md @@ -99,7 +99,7 @@ cp example-configs/qubes-os-master.conf builder.conf make get-sources -# And now to build all Qubes rpms (this will take a few hours): +# And now to build all Qubes RPMs (this will take a few hours): make qubes diff --git a/developer/general/gsoc.md b/developer/general/gsoc.md index 73d3c1f0..44b44a7b 100644 --- a/developer/general/gsoc.md +++ b/developer/general/gsoc.md @@ -332,7 +332,7 @@ immune to altering past entries. See in files there, no file manager, etc). - Configure GNOME to not look into external devices plugged in (no auto mounting, device notifications etc). -- Package above modifications as rpms, preferably as extra configuration files +- Package above modifications as RPMs, preferably as extra configuration files and/or plugins than overwriting existing files. Exceptions to this rule may apply if no other option. - Adjust comps.xml (in installer-qubes-os repo) to define package group with diff --git a/developer/services/dom0-secure-updates.md b/developer/services/dom0-secure-updates.md index 1636c026..e8adf33e 100644 --- a/developer/services/dom0-secure-updates.md +++ b/developer/services/dom0-secure-updates.md @@ -44,7 +44,7 @@ The qubes-receive-updates script processes the untrusted input from Update VM: i Once qubes-receive-updates finished unpacking and verifying the updates, the updates are placed in ``qubes-receive-updates`` directory in Dom0 filesystem. Those updates are now trusted. Dom0 is configured (see /etc/yum.conf in Dom0) to use this directory as a default (and only) [yum repository](https://github.com/QubesOS/qubes-core-admin-linux/blob/release2/dom0-updates/qubes-cached.repo). -Finally, qubes-dom0-update runs ``yum update`` that fetches the rpms from qubes-cached repo and installs them as usual. +Finally, qubes-dom0-update runs ``yum update`` that fetches the RPMs from qubes-cached repo and installs them as usual. Security benefit of our update mechanism ----------------------------------------