rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update docker

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-04-10 18:58:11 +02:00
parent 614739eb2b
commit a1e68d882f
6 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bsp/include/buildroot.mk
View File

@@ -14,6 +14,12 @@ buildroot.menuconfig: buildroot.config
$(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ savedefconfig
@echo "Saving defconfig done."
buildroot.nconfig: buildroot.config
$(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ nconfig
@echo "Saving defconfig (Waiting) ...."
$(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ savedefconfig
@echo "Saving defconfig done."
buildroot: buildroot.config
$(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ $(BR_TARGET)
@@ -29,24 +35,8 @@ $(BR_STAGING)/buildroot/.config: $(BR_PROJECT)/configs/buildroot_defconfig
@cp $(BR_PROJECT)/configs/buildroot_defconfig $(BR_STAGING)/buildroot/.config
$(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ defconfig
# should be deprecated.
buildroot.menuconfig.old: buildroot.config.old
$(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ menuconfig
cmp -s $(BR_STAGING)/buildroot/.config $(BR_PROJECT)/configs/buildroot.config; \
if test $$? -ne 0; then echo "Config Files has changed......"; \
cp $(BR_STAGING)/buildroot/.config $(BR_PROJECT)/configs/buildroot.config; \
fi
buildroot.config.old:
@mkdir -p $(BR_STAGING)/buildroot/
ifeq ("$(wildcard $(BR_STAGING)/buildroot/.config)","")
@cp $(BR_PROJECT)/configs/buildroot.config $(BR_STAGING)/buildroot/.config
else
cmp -s $(BR_PROJECT)/configs/buildroot.config $(BR_STAGING)/buildroot/.config; \
if test $$? -ne 0; then echo "Config Files has changed......"; \
cp $(BR_PROJECT)/configs/buildroot.config $(BR_STAGING)/buildroot/.config; \
fi
endif
buildroot.check-package:
find $(BR_PROJECT)/../../bsp/buildroot_external/package/ -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \) -exec $(BR_PROJECT)/../../bsp/buildroot/utils/check-package -b {} \;
install.sd:
sudo dd if=$(BR_STAGING)/buildroot/images/sdcard.img of=/dev/sdb && sync && sync

3
bsp/include/docker.mk
View File

@@ -8,4 +8,5 @@ docker.build:
docker.run:
@echo "Docker run image."
docker -D run -t -i $(BR_PROJECT_NAME):v$(VERSION) /bin/bash
@docker -D run --privileged -p 2000:2000 -p 8080:34080 -v $(BR_STAGING)/buildroot/target/usr:/usr \
-t -i $(BR_PROJECT_NAME):v$(VERSION)