에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 329c98ef767b4a852d2f1a9b64ae466cb84031c2

Authored by larche
2 parents e9e61e67e0 083ab1ea05
Exists in master and in 2 other branches fhd, fhd-demo

Merge branch 'master' of 192.168.10.12:falinux/1611_0007_prime_oven

Showing 18 changed files   Show diff stats
buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/boot/.empty
  Diff comments   View file @329c98e
buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/etc/fstab
  Diff comments   View file @329c98e
... ... @@ -7,5 +7,6 @@ tmpfs /tmp tmpfs mode=1777 0 0
7 7 tmpfs /run tmpfs mode=0755,nosuid,nodev 0 0
8 8 sysfs /sys sysfs defaults 0 0
9 9  
10   -#/dev/mmcblk3p1 /boot0 ext4 defaults 0 0
11   -#/dev/mmcblk3p2 /app ext4 defaults 0 0
  10 +/dev/mmcblk3p1 /boot ext4 defaults 0 0
  11 +/dev/mmcblk3p3 /falinux ext4 defaults 0 0
  12 +/dev/mmcblk3p4 /prime ext4 defaults 0 0
... ...
buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/etc/mdev.conf
  Diff comments   View file @329c98e
1 1 mmcblk[0-2]p[0-9] 0:0 0660 */etc/mdev/automount.sh $MDEV /mnt/${MDEV}
2   -mmcblk3p[2-9] 0:0 0660 */etc/mdev/automount.sh $MDEV /mnt/${MDEV}
3 2 mmcblk[4-9]p[0-9] 0:0 0660 */etc/mdev/automount.sh $MDEV /mnt/${MDEV}
4 3 sd[a-z][0-9] 0:0 0600 */etc/mdev/automount.sh $MDEV /mnt/${MDEV}
5 4 ub[a-z][0-9] 0:0 0600 */etc/mdev/automount.sh $MDEV /mnt/${MDEV}
... ...
buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/etc/mdev/automount.sh
  Diff comments   View file @329c98e
... ... @@ -15,13 +15,14 @@ if [ "$mounted" = "" ]; then
15 15  
16 16 echo "Mount : $1 -> $MNTPATH" > $LOGPATH
17 17 mkdir -p $MNTPATH
18   - if [ $1 == "mmcblk3p2" ]; then
19   - mount -v -t ext4 /dev/$1 $MNTPATH
20   - else
21   - mount -v -t ext4 /dev/$1 $MNTPATH
22   - fi
  18 + mount /dev/$1 $MNTPATH
23 19 wait
24 20 echo "Done : mount $MNTPATH" > $LOGPATH
  21 + if [ -f $MNTPATH/prime/run.sh ]
  22 + then
  23 + echo "Execute $MNTPATH/prime/run.sh" > $LOGPATH
  24 + sh $MNTPATH/prime/run.sh &
  25 + fi
25 26 else
26 27  
27 28 echo "Umount: $MNTPATH" > $LOGPATH
... ...
buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/falinux
View file @e9e61e6
... ... @@ -1 +0,0 @@
1   -/mnt/mmcblk3p3
2 0 \ No newline at end of file
buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/falinux/.empty
  Diff comments   View file @329c98e
buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/prime
View file @e9e61e6
... ... @@ -1 +0,0 @@
1   -/mnt/mmcblk3p4
2 0 \ No newline at end of file
buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/prime/.empty
  Diff comments   View file @329c98e
buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/system
View file @e9e61e6
... ... @@ -1 +0,0 @@
1   -/mnt/mmcblk3p2
2 0 \ No newline at end of file
buildroot/buildroot-2016.08.1/make.sh
  Diff comments   View file @329c98e
... ... @@ -23,6 +23,12 @@ QT5_DEFCONFIG_FILE=${QT5_DEFCONFIG_FILE/-/_}
23 23  
24 24  
25 25 OUTPUT_DIR=../output-buildroot-2016.08.1
  26 +if [ ! -f ${OUTPUT_DIR}/.config ]
  27 +then
  28 + echo ${DEFCONFIG_FILE}...
  29 + make O=${OUTPUT_DIR} ${DEFCONFIG_FILE}
  30 +fi
  31 +
26 32  
27 33 VERSION_DIR="board/falinux/prime_oven/rootfs_overlay/root/."${FA_PRODUCT}
28 34 VERSION_FILE=".buildroot_version"
... ...
buildroot/buildroot-2016.08.1/package/qt5/qt5base/0009-tslib-rotation.patch
  Diff comments   View file @329c98e
... ... @@ -0,0 +1,24 @@
  1 +diff -Naur a/src/platformsupport/input/tslib/qtslib.cpp b/src/platformsupport/input/tslib/qtslib.cpp
  2 +--- a/src/platformsupport/input/tslib/qtslib.cpp 2017-03-09 13:56:15.106194306 +0900
  3 ++++ b/src/platformsupport/input/tslib/qtslib.cpp 2017-03-09 13:55:49.937693339 +0900
  4 +@@ -121,12 +121,16 @@
  5 + if (dx*dx <= 4 && dy*dy <= 4 && pressed == m_pressed)
  6 + continue;
  7 + }
  8 +- QPoint pos(x, y);
  9 ++
  10 ++ int xn = 900 - y;
  11 ++ int yn = x;
  12 ++
  13 ++ QPoint pos(xn, yn);
  14 +
  15 + QWindowSystemInterface::handleMouseEvent(0, pos, pos, pressed ? Qt::LeftButton : Qt::NoButton);
  16 +
  17 +- m_x = x;
  18 +- m_y = y;
  19 ++ m_x = xn;
  20 ++ m_y = yn;
  21 + m_pressed = pressed;
  22 + }
  23 + }
  24 +
... ...
docker/Dockerfile
View file @e9e61e6
... ... @@ -1,41 +0,0 @@
1   -FROM ubuntu:16.04
2   -
3   -RUN locale-gen ko_KR.UTF-8
4   -
5   -ENV LANG ko_KR.UTF-8
6   -ENV LC_ALL ko_KR.UTF-8
7   -
8   -RUN sed -ri 's/\/archive\.ubuntu\.com/\/kr\.archive\.ubuntu\.com/g' /etc/apt/sources.list
9   -
10   -RUN \
11   - apt-get update && \
12   - apt-get -y install \
13   - curl sudo \
14   - git-core build-essential gcc-arm-none-eabi libssl-dev \
15   - sed binutils patch gzip bzip2 perl tar cpio python unzip rsync wget \
16   - libz3-dev libncurses5-dev pkg-config libusb-1.0-0-dev \
17   - bc lzop u-boot-tools vim flex bison subversion \
18   - && \
19   - rm -rf /var/lib/apt/lists/*
20   -
21   -CMD ["/bin/bash"]
22   -
23   -ADD toolchain/arm-buildroot-linux-gnueabihf-4.9.4.tar.gz /opt
24   -
25   -env WORK_TOP_PATH /work
26   -
27   -env FA_COMPANY falinux
28   -env FA_CHIPSET imx6s
29   -env FA_PRODUCT prime_oven
30   -
31   -env BR_TOOLCHAIN_PREFIX arm-buildroot-linux-gnueabihf
32   -env BR_TOOLCHAIN_PATH /opt/toolchain/${FA_CHIPSET}/${FA_PRODUCT}
33   -
34   -env CROSS_COMPILE ${BR_TOOLCHAIN_PREFIX}-
35   -env ARCH arm
36   -
37   -env PATH $PATH:${BR_TOOLCHAIN_PATH}/usr/bin
38   -env WORK_LD_LIBRARY_PATH ${BR_TOOLCHAIN_PATH}/usr/lib
39   -
40   -WORKDIR /work
41   -
docker/install.sh
View file @e9e61e6
... ... @@ -1,23 +0,0 @@
1   -#!/bin/sh
2   -
3   -PACKAGE_NAME=prime_oven
4   -
5   -echo "[*] Building docker image for ${PACKAGE_NAME}"
6   -docker build -t ${PACKAGE_NAME} .
7   -
8   -echo "[*] Copying runner script ~/bin"
9   -mkdir -p ~/bin/
10   -
11   -for RUNNER in runner/*
12   -do
13   - case $RUNNER in
14   - runner/docker-runner*)
15   - echo " = copy $RUNNER"
16   - cp --remove-destination $RUNNER ~/bin/
17   - ;;
18   - *)
19   - echo " = copy $RUNNER"
20   - cp -a --remove-destination $RUNNER ~/bin/
21   - ;;
22   - esac
23   -done
docker/runner/docker-runner
View file @e9e61e6
... ... @@ -1,14 +0,0 @@
1   -#!/bin/bash
2   -CONTAINER=$(basename $0)
3   -CONTAINER_HOSTNAME=${CONTAINER/_/-}
4   -docker run -it --rm \
5   - -h ${CONTAINER_HOSTNAME} \
6   - -u $(id -u):$(id -g) -e HOME=${HOME} -e USER=${USER} -v ${HOME}:${HOME} \
7   - -v /etc/passwd:/etc/passwd:ro \
8   - -v /etc/group:/etc/group:ro \
9   - -v /etc/shadow:/etc/shadow:ro \
10   - -v /etc/sudoers:/etc/sudoers:ro \
11   - -v /etc/timezone:/etc/timezone:ro \
12   - -v /etc/localtime:/etc/localtime:ro \
13   - -v $(pwd):/work -v /nfs:/nfs -v /tftpboot:/tftpboot \
14   - ${CONTAINER} $@
docker/runner/prime_oven
View file @e9e61e6
... ... @@ -1 +0,0 @@
1   -docker-runner
2 0 \ No newline at end of file
docker/toolchain/arm-buildroot-linux-gnueabihf-4.9.4.tar.gz
View file @e9e61e6
No preview for this file type
files/system.ini
  Diff comments   View file @329c98e
... ... @@ -0,0 +1,4 @@
  1 +[uart]
  2 +devname=/dev/ttymxc2
  3 +baud=19200
  4 +
... ...
release.sh
  Diff comments   View file @329c98e
... ... @@ -0,0 +1,45 @@
  1 +#!/bin/sh
  2 +git clean -x -f -d .
  3 +git checkout -- .
  4 +git pull
  5 +
  6 +UBOOT_SRC_DIR=bootloader/u-boot_2015_04
  7 +UBOOT_OUT_DIR=bootloader/output-u-boot_2015_04
  8 +
  9 +KERNEL_SRC_DIR=kernel/linux-imx6_3.14.28
  10 +KERNEL_OUT_DIR=kernel/output-linux-imx6_3.14.28
  11 +
  12 +BUILDROOT_SRC_DIR=buildroot/buildroot-2016.08.1
  13 +BUILDROOT_OUT_DIR=buildroot/output-buildroot-2016.08.1
  14 +
  15 +TAG=`git log -1 --pretty=format:%h`
  16 +IMAGE_DIR=`realpath $(pwd)/../images_${TAG}`
  17 +
  18 +cd ${UBOOT_SRC_DIR}
  19 +echo "=============================================="
  20 +echo " Build u-boot [ $(pwd) ]"
  21 +echo " IMAGE_DIR: ${IMAGE_DIR}"
  22 +echo "=============================================="
  23 +
  24 +CP_DIR=${IMAGE_DIR} ./make.sh
  25 +cd -
  26 +
  27 +cd ${KERNEL_SRC_DIR}
  28 +echo "=============================================="
  29 +echo " Build kernel [ $(pwd) ]"
  30 +echo " IMAGE_DIR: ${IMAGE_DIR}"
  31 +echo "=============================================="
  32 +
  33 +CP_DIR=${IMAGE_DIR} ./make.sh
  34 +cd -
  35 +
  36 +cd ${BUILDROOT_SRC_DIR}
  37 +echo "=============================================="
  38 +echo " Build buildroot [ $(pwd) ]"
  39 +echo " IMAGE_DIR: ${IMAGE_DIR}"
  40 +echo "=============================================="
  41 +
  42 +CP_DIR=${IMAGE_DIR} ./make.sh image
  43 +cd -
  44 +
  45 +cp -Ra files/* ${IMAGE_DIR}
... ...