20170824_jeffrey - silenceuncrio/diary GitHub Wiki

0920

繼續 monkeyjj

1130

aaron 提到我的 www 的 app/feature/ipfilter.html.src 進了 image 裡了

proscend/prosrc/www/Makefile

default:
	@if [ $(_BRAND_ID) -eq 2 ]; then \
		make handle_planet; \
	elif [ $(_BRAND_ID) -eq 44 ]; then \
		make handle_digicomm; \
	else \
		make handle_nobrand; \
	fi

	sed "s/\.js/\.js\?v=${label}/g; s/\.css/\.css\?v=${label}/g; s/\.html/\.html\?v=${label}/g" index.html.src > index.html

	sed "s/\.html/\.html\?v=${label}/g" app/feature/ipfilter.html.src 			> app/feature/ipfilter.html
	sed "s/\.html/\.html\?v=${label}/g" app/feature/ipsec.html.src 				> app/feature/ipsec.html
	sed "s/\.html/\.html\?v=${label}/g" app/feature/macfilter.html.src			> app/feature/macfilter.html
	sed "s/\.html/\.html\?v=${label}/g" app/feature/openvpn.html.src			> app/feature/openvpn.html
	sed "s/\.html/\.html\?v=${label}/g" app/feature/urlfilter.html.src			> app/feature/urlfilter.html

	sed "s/\.html/\.html\?v=${label}/g" app/feature/comPorts_v2.html.src		> app/feature/comPorts_v2.html
	sed "s/\.html/\.html\?v=${label}/g" app/feature/portForwarding_v2.html.src	> app/feature/portForwarding_v2.html

meta-proscend/recipes-core/prosrc/prosrc_0.1.bb

do_install() {
	...
	cp -rf  ${S}/prosrc/www/index.html ${D}/www
	cp -rf  ${S}/prosrc/www/app ${D}/www
	cp -rf  ${S}/prosrc/www/libs ${D}/www
	cp -rf  ${S}/prosrc/www/brand ${D}/www
	...
}

目前想到的是修改這些 *.src 的位置和 proscend/prosrc/www/Makefile

例如將相關的 *.src 都搬到 /prosrc/www/src 去

再修改 proscend/prosrc/www/Makefile 將其產出到正確的位置去

prosrc_0.1.bb 的 do_install() 可以保持不變