diff --git a/README.en.md b/README.en.md index 25139402202cc3094d805953dbda8185e5af70cf..3ca2bd1446421ec7b7b2ff3fbb7b3556d284fce7 100644 --- a/README.en.md +++ b/README.en.md @@ -29,7 +29,7 @@ You can get introduction of openEuler RaspberryPi SIG from [sig-RaspberryPi](htt - Join Slack workspace: [openeuler-raspberrypi](https://openeuler-raspberrypi.slack.com ) - [Invite link](https://join.slack.com/t/openeuler-raspberrypi/shared_invite/zt-kp6de2va-2t4k6JqvNWKogtYv1Kg3pQ): This link will be due on Feb 11th, 2021. We will update the link periodically. - Weekly meeting schedule - - Meeting Time: The 1st and 3rd Tuesday of each month, 15:00 - 15:30 UTC+8. + - Meeting Time: The 1st and 3rd Wednesday of each month, 20:00 - 20:30 UTC+8. - Meeting Link: There are two methods to get the meeting link which will be updated before each meeting. - Log in to the [openEuler Community](https://openeuler.org/) website, then view the booking information of `sig-RaspberryPi例会` in the meeting calendar. - Search `openEuler` in mini programs of Wechat, add `openEuler mini program`. Then click `会议` and view the booking information of `sig-RaspberryPi例会`. diff --git a/README.md b/README.md index 1cb95bd25ca9ae96179c5203ea40fd5422c95588..1cf1a71245d27c21859ad12fa23990aa64cd97a1 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ SIG 组基本信息位于 [sig-RaspberryPi](https://gitee.com/jianminw/community - 建立或回复 issue:欢迎通过建立或回复 issue 来讨论,此 SIG 组维护的仓库列表可在 [sig-RaspberryPi](https://gitee.com/jianminw/community/tree/master/sig/sig-RaspberryPi) 中查看。 - 加入 Slack 群组:[openeuler-raspberrypi](https://openeuler-raspberrypi.slack.com ) - [加入群组链接](https://join.slack.com/t/openeuler-raspberrypi/shared_invite/zt-kp6de2va-2t4k6JqvNWKogtYv1Kg3pQ),此链接于 2021/02/11 失效,我们会定期更新。 -- SIG 组会议:每个月的第一个和第三个周二下午 03:00 - 03:30 会进行一次讨论会议 +- SIG 组会议:每个月的第一个和第三个周三晚上 20:00 - 20:30 会进行一次讨论会议 - 会议链接:有以下两种获取方式 - [openEuler 社区网站](https://openeuler.org/)下的会议日历中查看 `sig-RaspberryPi例会` 预定信息。 - 微信小程序搜索 `openEuler`,添加 `openEuler` 小程序,可在其`会议`栏目查看 `sig-RaspberryPi例会` 预定信息。 diff --git a/scripts/build-image-common.sh b/scripts/build-image-common.sh index 7cbc5e2441189f718a50f156f1acc850b0fc3cb9..2dffb01c4498167ce58e897c501ac5073377befb 100644 --- a/scripts/build-image-common.sh +++ b/scripts/build-image-common.sh @@ -244,11 +244,19 @@ prepare(){ ERROR "${os_release_name} can not be found!" exit 2 fi - set -e - wget https://raw.githubusercontent.com/RPi-Distro/raspberrypi-sys-mods/master/etc.armhf/udev/rules.d/99-com.rules -P ${tmp_dir}/ + if [ $? -ne 0 ]; then + cp ${euler_dir}/99-com.rules ${tmp_dir}/ + fi wget https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/plain/regulatory.db.p7s -P ${tmp_dir}/ + if [ $? -ne 0 ]; then + cp ${euler_dir}/regulatory.db.p7s ${tmp_dir}/ + fi wget https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/plain/regulatory.db -P ${tmp_dir}/ + if [ $? -ne 0 ]; then + cp ${euler_dir}/regulatory.db ${tmp_dir}/ + fi + set -e if [ ! -d ${img_dir} ]; then mkdir -p ${img_dir} fi diff --git a/scripts/build-image.sh b/scripts/build-image.sh index 8a4f19cb35d5b90ee79b89eaa03b9d5044e29b7e..4a341a100212cff024e87e2e31a2c7fee2b7b1e4 100644 --- a/scripts/build-image.sh +++ b/scripts/build-image.sh @@ -258,8 +258,8 @@ make_rootfs(){ mkdir -p $rootfs_dir/etc/sysconfig/network-scripts fi cp ${euler_dir}/ifcfg-eth0 $rootfs_dir/etc/sysconfig/network-scripts/ifcfg-eth0 - mkdir -p ${rootfs_dir}/usr/bin ${rootfs_dir}/lib/udev/rules.d ${rootfs_dir}/lib/systemd/system - if [ -d ${rootfs_dir}/usr/share/licenses/raspi ]; then + mkdir -p ${rootfs_dir}/lib/udev/rules.d + if [ ! -d ${rootfs_dir}/usr/share/licenses/raspi ]; then mkdir -p ${rootfs_dir}/usr/share/licenses/raspi fi cp ${euler_dir}/*.rules ${rootfs_dir}/lib/udev/rules.d/