Fan always running on Archlinux with Openbox

Fix:

# yaourt -S i8kutils i8kmon

# sudo modprobe i8k (or add to /etc/rc.conf)

# i8kmon -a -d (or add to ~/.config/openbox/autostart.sh)

For CPU frequency control, please see:

https://wiki.archlinux.org/index.php/CPU_Frequency_Scaling

/* 选词框的光标跟随 */
$ cat /etc/gtk-2.0/gtk.immodules
“/usr/lib/gtk-2.0/2.10.0/immodules/im-ibus.so”
“ibus” “X Input Method” “gtk20″ “/usr/share/locale” “en:zh”

Create Git Server

We will use Debian Linux as an example to setup Git server. Other system is similar. There are many methods to set up Git server. For example, git can be remotely accessed by “git://”, “http[s]://”, “ssh://” , “rsync://” and so on. Here we will setup an git server wich can be accessed by using “git:// ”.

Install and initialize Git server

Install “git” and “git-daemon-run” by the commad:

# apt-get install git-core

# apt-get install git-daemon-run

Create “git” directory in home directory and then create source code directory. In my computer, the source code directory is “/home/kmeng/git/madwifi4099”.

# cd ~

# mkdir git

# cd git

#mkdir madwifi4099

Initialize git depository:

# cd madwifi4099

# git-init-db

“git-daemon-run” is used to start up the git daemon. Modify the script for git-daemon:

# cat /etc/sv/git-daemon/run

#!/bin/sh
exec 2>&1
echo ‘git-daemon starting.’
exec git-daemon –verbose –export-all –base-path=/path/to/git/

“/path/to/git” is the directory of git depository, which is “/home/kmeng/git” in my computer.

Commit original madwifi code

Then copy source code to madwifi4099 directory.

# cp ~/madwifi-trunk-r4099-20090929 madwifi4099

# git add *

# git commit

Use Git client

Configure author information

Setup local information by editing the “gitconfig” file or using “git config” command. Following is the example of my “gitconfig” file.

# cat ~/.gitconfig

[user]

email = kmeng@crimson.ua.edu

name = Ke Meng

You may also customize your git by adding other tags.

Simple usage to modify code and commit

Here I just talk about the simplest use of git. We only get the code from the git server, modify the code and then commit the modification. The advanced uses will be explained later.

Clone the git depository from git server:

# git clone git://w4net.dyndns.org/madwifi4099

After modifying the code, use “git add” to add all file contents to the index

# git add filenames

Then use “git commit” record changes to the repository (Make sure to write commit log):

# git commit

If you didn’t add new files, you can combine “git add” and “git commit” together by:

# git commit -a

Then you can use “git format-patch” to generate the patch file for this commit:

# git format-patch HEAD^

To apply the patch file, use:

# git am < 00001-patchfile.patch

When there are errors of am, we can use

# git apply --reject 00001-patchfile.patch

This will commit the conflict-free file and show the errors such as "error: while searching for: "

Then we can manually modify the conflict file and use the command to add

# git add filename

In the end:

# git am –resolved

Configure git mail

After generating the patch file, we will use “msmtp” as the SMTP client to send the patch. In my Archlinux system, the msmtp can be installed by the command:

# pacman -S msmtp

Then configure “msmtp” by editing the configure file:

# cat ~/.msmtprc

account UA
host smtp.gmail.com
port 587
auth on
tls on
from kmeng@crimson.ua.edu
user kmeng@crimson.ua.edu
password ******

account default : UA

The file contains your password. So wet the mode of .msmtprc to 600, which only allow yourself to access the file:

# chmod 600 ~/.msmtprc

Configure git to send mail by using “msmtp “

# git config –global sendemail.smtpserver /usr/bin/msmtp

Then use “git send-mail” to send the patch file:

# git send-email –to kmeng@cs.ua.edu 000*.patch

Advanced usage of Git

There status in Git

There are three commit status defined as tree, index and commit in git.

Tree: When modifying the code, they only take effect in the tree. The index and commit are keep the old version.

Index: After modification, we use the command of “git add” to add modified files to the index. The changes have not been recorded right now.

Commit: Record changes to the repository.

Constants in Git

HEAD: The latest commit state

HEAD^ (HEAD~1): The parent of HEAD

HEAD^^ (HEAD~2): The parent of HEAD^^

……

I think we know why HEAD^ is used to generate patch right now.

git diff

Show changes between commits, commit and working tree, etc.

git diff: the difference between tree and index. When we modified the code and didn’t use “git add” to add the files to the index, this command may be used to show our modification. After “git add”, “git diff” will not show any difference.

git diff HEAD: show the difference between tree and commit depository. HEAD is the latest commit. So after “git add”, we can use this command to show the difference between current working tree and the commit depository.

git diff –cached: the difference between index and commit depository. The command will show the modification so long as you haven’t commit the changes to depository.

git reset

Reset current HEAD to the specified state

git reset –soft: reset commit information. The working tree and index are not been reset. This also means resume to the state before “git commit” after “git add”. This command can be used when you only want to modify the commit log. You need do the “git commit” when you want to recommit.

git reset –mixed: reset commit and index. The working tree is not been reset. This also means resume to the state before “git add” and keep the changes in working tree. This command can be used when you only want to modify some code and then continue to commit. You need do both “git add” and “git commit” when you want to recommit the changes.

git reset –hard : reset commit, index and tree. Completely reset current HEAD to specified state. Think clearly before all your work after last commit being cleaned.

git reset– filename: reset a single file in the index. Suppose you have added a file to your index, but later decide you do not want to add it to your commit. You can remove the file from the index while keeping your changes with git reset.

git branch

There is only one branch called “master” after clone the git depository from the git server. We can create new branches to test our new modification. After testing, we can update the master branch by merge, pull or even patch.

“git branch” is used to list, create, or delete branches. To create a new branch name “kmeng”:

# git branch kmeng

To checkout to the new branch:

# git checkout kmeng

Or combine the create and checkout together by the command:

# git checkout -b kmeng

Merge “kmeng” branch to the current branch:

# git merge kmeng

Pull “kmeng” branch to current branch:

# git pull . kmeng

Pull branch from other depository to current branch

# git pull /home/kmeng/other/git/depository

git rebase

Forward-port local commits to the updated upstream head. We will use the example in the git help to explain the command.

Assume the following history exists and the current branch is “topic”:

A—B—C topic

/

D—E—F—G master

From this point, the result of either of the following commands:

# git rebase master

# git rebase master topic

would be:

A’–B’–C’ topic

/

D—E—F—G master

Git rebase also has other complicated usage which will not be talked here.

git log

Show commit log. For example:

# git log

commit f6f84537cdd88953ada7c49753e1ac48ef2275aa

Author: Ke Meng <kmeng1219@gmail.com>

Date: Wed Jan 13 19:55:11 2010 -0600

kmeng add dos frame transmit

git show

Show various types of objects

Show the commit log and patch of one commit:

# git show f6f84537cdd88953ada7c49753e1ac48ef2275aa

# git show HEAD^

git whatchanged

Show logs with difference each commit introduces

You can show the changes between two commits or two branches.

# git whatchanged master..kmeng

# git whatchanged HEAD^^..HEAD

This command can also show detailed textual diffs by “-p” options:

# git whatchanged -p master..kmeng

git server:

git-core

git-daemon-run

#mkdir /git

#cd /git/

#git-init-db

#cp files to /git/

#apt-get install git-daemon

#vi /etc/sv/git-daemon/run

#!/bin/sh
exec 2>&1
echo ‘git-daemon starting.’
exec git-daemon –verbose –export-all –base-path=/home/kmeng/git/

git client:

git config sendemail.smtpserver /usr/bin/msmtp
git config –global sendemail.cc “kmeng1219@gmail.com”
msmtp

~/.msmtprc

09     account gmail
10     host smtp.gmail.com
11     port 587
12     auth on
13     tls on
14     from kmeng1219@gmail.com
15     user “kmeng1219″
16     password “******”
17
18
19 # Default account
20 account default : gmail

chmod 600 ~/.msmtprc
~/.mailrc

set sendmail=”/usr/bin/msmtp”