- 在Git中用beyond compare进行比较合并
sudo stop lightdm
sudo apt-get update
sudo apt-get upgrade
sudo apt-get dist-upgrade
sudo apt-get install --reinstall lightdm
sudo start lightdm
sudo aptitude install ia32-libs
sudo dpkg -i bcompare-4.0.0.18847_amd64.deb
$ cat ~/.gitconfig
zbunix@32u:~/ard/rk3188/4.2_release$ cat /home/zbunix/.gitconfig
[color]
ui = auto
[user]
name = zbunix
email = [email protected]
[merge]
tool = bc3
[mergetool "bc3"]
cmd = /usr/bin/bcompare $LOCAL $REMOTE $BASE $MERGED
trustExitCode = true
[diff]
external = /home/zbunix/ard/env_ard/git-diff-wrapper.sh
[difftool]
prompt = false
$ cat /home/zbunix/ard/env_ard/git-diff-wrapper.sh
#!/bin/sh
# diff is called by git with 7 parameters:
# path old-file old-hex old-mode new-file new-hex new-mode
"/usr/bin/bcompare" "$2" "$5" | cat
diff时，用git difftool 来查看就会直接弹出bcompare.
merge时，要先用git merge 来merge一下，
然后如果提示merge有冲突，才用git mergetool来调用bcompare来merge
Ubuntu12.04手动添加DNS后无法保存
==============================
sudo vi /etc/resolvconf/resolv.conf.d/tail
nameserver 202.96.134.133
nameserver 202.96.128.68
sudo /etc/init.d/resolvconf restart
ubuntu官方源source.list
=======================
ip138.com
archive.ubuntu.com >> 91.189.92.201
本站主数据：英国
参考数据一：英国
us.archive.ubuntu.com >> 91.189.91.13
本站主数据：英国
参考数据一：英国
SSH Server 的安装和设置
========================
sudo apt-get install openssh-server
ssh密钥登录认证成功的四个必备条件
==================================
0. 用户公钥(id_rsa.pub)文件内容追加到服务器的 ~/.ssh/authorized_keys文件末尾。
1. .ssh目录只有仅有user_name有读写执行权限(700), 组用户和其它用户都不能有任何权限。
2. .ssh/authorized_keys文件只有仅有user_name有读写权限(600)，组用户和其它用户都不能有任何权限。
3. /home/user_name home目录确保只有仅有user_name有写的权限（700），组用户和其它用户权限无特别要求。
Ubuntu 12.04 xmanage配置 https://wiki.ubuntu.com/xdmcp
========================
sudo vim /etc/lightdm/lightdm.conf
[XDMCPServer]
enabled=true
sudo restart lightdm
Ubuntu 14.04 xmanage配置
============================
操作命令，打开终端，关于消除白点：
sudo xhost +SI:localuser:lightdm
sudo su lightdm -s /bin/bash
gsettings set com.canonical.unity-greeter draw-grid false
关闭来宾账户命令：
sudo sh -c 'echo "allow-guest=false" >> /usr/share/lightdm/lightdm.conf.d/50-ubuntu.conf'
sudo service lightdm restart
文件共享samba安装
================================================
sudo apt-get install samba
sudo apt-get install smbfs
zbunix@32u:~$ cat /etc/samba/smb.conf
[global]
workgroup = WORKGROUP
server string = Samba
log file = /var/log/samba/log.%m
max log size = 50
security = user
passdb backend = tdbsam
encrypt passwords=yes
socket options = TCP_NODELAY
load printers = no
printing = bsd
printcap name = /dev/null
disable spoolss = yes
[homes]
comment = Home Directories
browseable = no
writable = yes
path = /home/%S/ard
valid users = %S
create mode = 0664
directory mode = 0775
#[Public]
# comment = Public
# path = /home/qnap/Public
# browseable = yes
# writable = yes
# write list = root zbunix
# valid users = root zbunix
# create mode = 0664
# directory mode = 0775
[git]
comment = git
path = /home/git
browseable = yes
writable = yes
write list = root zbunix git
valid users = root zbunix git
create mode = 0664
directory mode = 0775
建smb用户和密码
sudo smbpasswd -a zbunix
重启samba
sudo /etc/init.d/smbd restart
安装jdk
================================================
zbunix@32u:~$ ll ard/env_ard/
总用量 83332
drwxrwxr-x 3 zbunix zbunix 4096 7月 17 14:06 ./
drwxrwxr-x 4 zbunix zbunix 4096 7月 17 14:05 ../
-rw-rw-r-- 1 zbunix zbunix 149 7月 17 14:06 env_ard.sh
drwxr-xr-x 10 zbunix zbunix 4096 7月 16 22:10 jdk1.6.0_25/
-rwxr--r-- 1 zbunix zbunix 85315136 7月 16 17:45 jdk-6u25-linux-x64.bin*
zbunix@32u:~$ cat ard/env_ard/env_ard.sh
export JAVA_HOME=~/ard/env_ard/jdk1.6.0_25
export CLASSPATH=./:$JAVA_HOME/lib:$JAVA_HOME/jre/lib
export PATH=$JAVA_HOME/bin:$JAVA_HOME/jre/bin:$PATH
sudo sh -c 'echo "source ~/ard/env_ard/env_ard.sh" >> ~/.bashrc'
source ~/.bashrc
Installing required packages (Ubuntu 12.04)
===============================================
$ sudo apt-get install git gnupg flex bison gperf build-essential \
zip curl libc6-dev libncurses5-dev:i386 x11proto-core-dev \
libx11-dev:i386 libreadline6-dev:i386 libgl1-mesa-glx:i386 \
libgl1-mesa-dev g++-multilib mingw32 tofrodos \
python-markdown libxml2-utils xsltproc zlib1g-dev:i386
$ sudo ln -s /usr/lib/i386-linux-gnu/mesa/libGL.so.1 /usr/lib/i386-linux-gnu/libGL.so
代码查看编辑geany
===================================
ubuntu软件中心安装geany
ubuntu14.04编译android4.2出错
=============================
Can't locate Switch.pm in @INC (you may need to install the Switch module) (@INC contains: /etc/perl /usr/local/lib/perl/5.18.2 /usr/local/share/perl/5.18.2 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.18 /usr/share/perl/5.18 /usr/local/lib/site_perl .) at external/webkit/Source/WebCore/make-hash-tools.pl line 23.
BEGIN failed--compilation aborted at external/webkit/Source/WebCore/make-hash-tools.pl line 23.
Can't locate Switch.pm in @INC (you may need to install the Switch module) (@INC contains: /etc/perl /usr/local/lib/perl/5.18.2 /usr/local/share/perl/5.18.2 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.18 /usr/share/perl/5.18 /usr/local/lib/site_perl .) at external/webkit/Source/WebCore/make-hash-tools.pl line 23.
BEGIN failed--compilation aborted at external/webkit/Source/WebCore/make-hash-tools.pl line 23.
make: *** [out/target/product/rk30sdk/obj/STATIC_LIBRARIES/libwebcore_intermediates/Source/WebCore/html/DocTypeStrings.cpp] 错误 2
make: *** 正在等待未完成的任务....
make: *** [out/target/product/rk30sdk/obj/STATIC_LIBRARIES/libwebcore_intermediates/Source/WebCore/platform/ColorData.cpp] 错误 2
解决方法是安装perl的switch库
zbunix@32u:~/ard/rk3188/rk3188_4.2$ sudo apt-get install libswitch-perl
修改更新grub-efi配置文件
==========================
sudo vi /etc/default/grub
zbunix@32u:~$ sudo update-grub
update-grub update-grub2
zbunix@32u:~$ sudo update-grub2
Generating grub configuration file ...
Found linux image: /boot/vmlinuz-3.13.0-30-generic
Found initrd image: /boot/initrd.img-3.13.0-30-generic
Found linux image: /boot/vmlinuz-3.13.0-24-generic
Found initrd image: /boot/initrd.img-3.13.0-24-generic
Found Ubuntu 12.04.4 LTS (12.04) on /dev/sda2
Adding boot menu entry for EFI firmware configuration
done
android编译提速
================
sudo sh -c 'echo "export USE_CCACHE=1" >> ~/.bashrc'
source ~/.bashrc
zbunix@32u:~/ard/rk3188/rk3188_4.2.2_r1_master$ find -name ccache
./prebuilts/misc/windows/ccache
./prebuilts/misc/darwin-x86/ccache
./prebuilts/misc/darwin-x86/ccache/ccache
./prebuilts/misc/linux-x86/ccache
./prebuilts/misc/linux-x86/ccache/ccache
zbunix@32u:~/ard/rk3188/rk3188_4.2.2_r1_master$ prebuilts/misc/linux-x86/ccache/ccache -M 100G
Set cache size limit to 104857600k