openwrt之wrtnode学习日记day4

来源:互联网 发布:sql查询语句选取行 编辑:程序博客网 时间:2024/05/16 09:47

今天才反应过来,dl目录就是Download目录。(lll¬ω¬)

make V=s时停在cloning into ‘procd-2015-10-29.1’…

情况:

编译时停在cloning into ‘procd-2015-10-29.1’…

分析:

1.dl下确实有这个procd包。出现这个情况,应该是这个包旧了。
经过查看,手上的包都是15年下半年下载的,出现这个情况也可以理解了。

2.比较新旧两个package/system/procd目录下文件

diff -ruN procd_old/ procd_new/ > diff.txt

得到结果如下:

vim diff.txt

diff -ruN procd_old/Makefile procd_new/Makefile--- procd_old/Makefile  2015-12-21 20:13:31.895158321 -0800+++ procd_new/Makefile  2016-12-31 01:26:45.000000000 -0800@@ -1,5 +1,5 @@ #-# Copyright (C) 2014-2015 OpenWrt.org+# Copyright (C) 2014-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information.@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=procd-PKG_VERSION:=2015-10-29+PKG_VERSION:=2015-10-29.1 PKG_RELEASE=$(PKG_SOURCE_VERSION)diff -ruN procd_old/patches/0001-Align-early-init-PATH-with-system-wide-OpenWrt-path.patch procd_new/patches/0001-Align-early-init-PATH-with-system-wide-OpenWrt-path.patch--- procd_old/patches/0001-Align-early-init-PATH-with-system-wide-OpenWrt-path.patch    1969-12-31 16:00:00.000000000 -0800+++ procd_new/patches/0001-Align-early-init-PATH-with-system-wide-OpenWrt-path.patch    2016-12-31 01:26:45.000000000 -0800@@ -0,0 +1,32 @@+From 45cb04fd85d788a37367a5385e5e90dd98a0a991 Mon Sep 17 00:00:00 2001+From: Jo-Philipp Wich <jow@openwrt.org>+Date: Thu, 14 Jan 2016 13:51:36 +0100+Subject: [PATCH] Align early init PATH with system wide OpenWrt path value++Changeset r47080 globally unified the executable search path in OpenWrt,+now update procd to use the same path value.++This fixes diverging path values observed in programs launched by netifd+which inherits the early path value from procd.++Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>+---+ initd/early.c | 2 +-+ 1 file changed, 1 insertion(+), 1 deletion(-)++diff --git a/initd/early.c b/initd/early.c+index e87774f..5821c58 100644+--- a/initd/early.c++++ b/initd/early.c+@@ -90,7 +90,7 @@ early_mounts(void)+ static void+ early_env(void)+ {+-  setenv("PATH", "/bin:/sbin:/usr/bin:/usr/sbin", 1);++  setenv("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);+ }++ void+--+2.1.4+

3.由此可知,有以下几点改动:
1)Makefile中Copyright (C) 2014-2015 OpenWrt.org变为2014-2016
2)PKG_VERSION:=2015-10-29变为2015-10-29.1
3)新的procd目录下新建了一个patch目录,里面放了一个新文件

4.根据以上改动,我们可以把Makefile修改一行,并删掉patch目录,就可还原回2015年的状态
当然使用diff patch命令也可以(具体命令使用方式如下)

PS.diff : 比较文件不同
diff 文件1 文件2 :
终端屏幕没有显示结果, 代表文件1 和 2 的内容相同 .

PS.打补丁 :
1、diff -ruN old(旧版本) new(新版本) > diff.txt
生成补丁文件diff.txt
r :递归子目录
u :保证补丁文件格式一致
N :保证补丁文件能够正确修改
2、cd old
3、patch -p1 < ../diff.txt
完成打补丁 .

PS.取消打补丁操作:
patch -Rp1 < ../diff.txt

编译时出现Signing key has not been configured

解决办法参照:
http://blog.csdn.net/geniusmen/article/details/43878139
http://killeraction.iteye.com/blog/858325

Country Name (2 letter code) [AU]:CN ← 国家代号,中国输入CN
State or Province Name (full name) [Some-State]:BeiJing ← 省的全名,拼音
Locality Name (eg, city) []:BeiJing ← 市的全名,拼音
Organization Name (eg, company) [Internet Widgits Pty Ltd]:MyCompany Corp. ← 公司英文名
Organizational Unit Name (eg, section) []: ← 可以不输入
Common Name (eg, YOUR name) []: ← 此时不输入
Email Address []:admin@mycompany.com ← 电子邮箱,可随意填

0 0
原创粉丝点击