This page provides some basic instructions for day-to-day usage of the git-based package maintenance system for Fedora. It is intended primarily for new and current Fedora package maintainers, but does briefly cover anonymous read-only use of the system. It is not a guide to RPM packaging per se. Some pre-existing knowledge of git may be useful, but is not a pre-requisite (in fact, Fedora packaging can be a relatively painless introduction to it).
You may have been looking for, or also be interested in:
- Learning to create packages
- Becoming a package maintainer
- Submitting package updates
- Adding a new package to the repository as an existing maintainer
- adding a new release branch to an existing package
- The Packaging Guidelines
Installing fedpkg and doing initial setup
The fedpkg tool will usually be your primary interface to the packaging system. Install it with yum install fedpkg, or any equivalent command. If you have not already done so, you will also need to install 
fedora-packagerfedora-packager-setup. If you have run fedora-packager-setup before, but wish to set up a new machine for package maintenance, copy the files ~/.fedora*.cert to the new system.
You also must have an ssh key configured in the Fedora Accounts System to be able to make changes to any package (including your own). fedpkg will expect the correct ssh key to be available in your keyring.
Common fedpkg commands
This section lists typical fedpkg commands in a normal workflow, with short descriptions. Longer explanations for each can be seen by clicking the 'Show' links.
- Check out a package:
fedpkg co <source_package_name> cd <source_package_name>
This retrieves a copy of the package sources from the server. It's known as your 'working copy'.
- Update your checked-out copy from the Fedora server:
fedpkg pull
- Retrieve the package sources:
fedpkg sources
This pulls any sources stored in the "lookaside cache" (see below for more). Steps like fedpkg prep and fedpkg srpm will do this if necessary, but you may want a copy right away.
- Make your changes to the package
This is not an RPM packaging guide, so we'll assume you know what you're doing here. New sources and patches go in the working copy directory for now.
- Run the 'prep' stage (extract source, apply patches etc) within the checkout directory:
fedpkg prep
This is useful for making sure your patches apply cleanly, and inspecting the source tree if you need to do so.
- Do a local build of the current state:
fedpkg local
This is the simplest kind of test build, but it's usually cleaner and a better test to do a Mock or Koji scratch build (see below).
- Do a mock build of the current state:
fedpkg mockbuild
This fires off a Mock build, if you have Mock configured correctly. Using_Mock_to_test_package_builds can help there.
- Generate a .src.rpm from the current state:
fedpkg srpm
You can request a Koji 'scratch build' (a test build, which will not go to any repository) of the generated .src.rpm with the koji build --scratch command (see man koji).
- Check changes you have made:
fedpkg diff
This is handy for making sure you didn't touch something by mistake, or forget to bump the release, or forget to include a changelog...
- Run some checks (rpmlint) on your package:
fedpkg lint
- Stage any small patches or new source files for commit:
git add (somefile)
git does not consider all files in the working directory to be a part of the git repository by default (handy, for keeping other files around that are relevant, like the source tree). This tells git to start considering these files as part of the repository locally. When you 'commit' and 'push' later, this change is communicated to the server.
- Upload new source files to the lookaside cache:
fedpkg new-sources
This will replace the current list of source files, not add to it. See Details for more details on the lookaside cache system.
fedpkg upload
'Pristine' upstream sources (like release tarballs) and other larger source files are stored in the lookaside cache system, not committed directly to git. This provides more efficient storage and transfer of the files. The sources and .gitignore files in the repository keep it in sync with the lookaside cache. Any time you use fedpkg new-sources or fedpkg upload, you must remember to 'commit' changes to those files.
new-sources 'starts from scratch', replacing all files currently in the lookaside cache - you'll typically use this command for many packages with just a single source tarball, each time you update to a new upstream version. upload just adds the given file to those already in the cache. Do remember not to leave stale sources lying around.
- Switch to a different release branch:
fedpkg switch-branch <f40, el6, master>
Each Fedora release has its own branch in each package repository so different builds can be sent to each release. See below for more details on working with branches.
- Generate git changelog from package changelog:
fedpkg clog
This command extracts your package changelog entry to the file clog, so you can use it as the git changelog if you like. Some maintainers draw a distinction between the two, some do not.
- Commit changes:
fedpkg commit (-F clog) (-p) (-c)
This behaves by default like
git commit -a - it stages all modified files, though it does not add unstaged files.This creates a sort of bundle, a 'commit', of your changes to the repository, with a unique identity and a changelog. Other maintainers - and you yourself, later - can view the history of changes to the repository with the 'commit' as the finest level of detail. It is good practice to use many relatively small commits, each for a single purpose - don't combine a version bump with a bunch of whitespace fixes and some scriptlet changes all in one commit, create separate commits for each.
The -F clog parameter will use the clog file from the previous step as the changelog. -p will push (see below) at the same time as committing. -c combines the clog and commit -F clog steps into one, if you like that.
- Push changes:
fedpkg push
This sends all the new 'commits' in your local working copy to the upstream server. If you are still learning the system, now is a good time to fedpkg co another copy of the repository somewhere else, compare what you get to your working copy, and run a test build on it.
- Do an 'official' build of the latest pushed changes:
fedpkg build
This is the first point at which you might possibly cause real mess for a real user, so use it with caution.
Unlike most of the above commands, this operates on the state you have pushed to git, not the local state. If you have issues make sure you have pushed and committed all patches and handled the sources correctly.
This triggers a 'real' (not scratch) build of your package in Koji. Depending on the release you are building for, it may go directly to the stable state or it may have to run through the update process. See the package update guide for more details on this. The command will output a URL where you can monitor the build's progress in Koji.
- Submit a package update for the latest build:
fedpkg update
Again, see the package update guide for more details on this process.
Typical fedpkg session
A typical session may look like this:
fedpkg clone foo cd foo fedpkg sources fedpkg new-sources foo-0.0.2.tar.bz2 gedit foo.spec # change the required things in the specfile. rpmdev-bumpspec is useful for simple version updates fedpkg mockbuild # check that the changes you made are correct fedpkg diff fedpkg lint fedpkg commit -p -c # commit and push in one go
Merging
Merging is one of the things that we can now do directly in the VCS that we had to do with an external diff program in CVS. Getting used to how it works may take a little adjustment though.
Initial Merging
Merging in normal operation
Now when you make changes on one branch and want to move them to a different branch, you can use git to merge those changes.
fedpkg clone bzrtools # Make some changes in the master branch fedpkg new-sources bzrtools-2.2.tar.gz vim bzrtools.spec git commit fedpkg switch-branch f14 git merge master # for push into repo git push
Resolving merge conflicts
When you git merge and a conflict occurs you still edit the files that have conflicts. Remove the conflict markers in the files and merge the changes manually. Then you need to commit your changes. Do that with git add CONFLICTEDFILES ; git commit
Using git mergetool to resolve conflicts
Git allows you to set a graphical diff program to help resolve conflicts. This can be handy for visualizing what changes have occurred and deal with them as a set.
git config --global merge.tool meld fedpkg switch-branch f13 git merge master # Conflicts occurred git mergetool # Opens up a meld showing a three way diff of the merge, working tree, and the last commit # Resolved all the conflicts in the GUI git add CONFLICTEDFILES git commit
Branch names
| Old CVS | new remote git | fedpkg local branch names | Notes |
|---|---|---|---|
| devel | origin/master | master | This is the default when you do fedpkg co |
| F-16 | origin/f16/master | f16 | |
| F-15 | origin/f15/master | f15 | |
| F-14 | origin/f14/master | f14 | |
| EL-6 | origin/el6/master | el6 | |
| EL-5 | origin/el5/master | el5 |
If you use git commands to branch and checkout directly, you can define whatever local branch names you want. If you use
fedpkg switch-branch, it will default to creating the names listed in the table above. So you can do fedpkg clone firefox ; fedpkg switch-branch f14 and then you'll have a new local branch named f14
It is often helpful to know what branch you are working on at a glance. You can add this information to your bash prompt with the information here.
Errors
Access denied
During the next few days and weeks, occasional tweaking to the servers might cause short periods (seconds or minutes) when the git server refuses you access. Just try again.
Unable to switch
If you are trying switch to another branch by fedpkg switch-branch f13 and see this: Unable to switch to another branch: Could not create branch f13
Then you probably have some un-commited changes in master. If you want them, call:
# this "saves" your changes git stash # switch to preferred branch, now possible fedpkg switch-branch f13 # apply "saved" changes into the current branch git stash apply
ssh fingerprint
The recommended option is to include "VerifyHostKeyDNS yes" in your ~/.ssh/config file. This will result in using DNS to check that the key is correct.
But you can also manually check against the list of keys at https://admin.fedoraproject.org . The strings there are what ends up in your ~/.ssh/known_hosts file. So you can accept the fingerprint when prompted and then check that the correct string for pkgs.fedoraproject.org ended up in your ~/.ssh/known_hosts file.
References
- http://pkgs.fedoraproject.org/cgit/
- Package SCM admin requests
- Package_Renaming_Process
- PackageMaintainers/PackagingTricks
- Package_update_HOWTO
- PackageMaintainers/BuildSystemClientSetup#Install_the_Client_Tools_.28Koji.29
- PackageMaintainers/MockTricks#How_do_I_use_Mock.3F
- Package_Review_Process
- Fedora_Release_Life_Cycle
- PackageMaintainers/Join
- Infrastructure/VersionControl/dist-git