[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2481-g2226f4e
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2011-08-11 15:15:15
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 2226f4e8a6651943e8f35d1a453b0e353fb4e562 (commit)
from adc7bcc32c5182d96e0070af0b64379f061790dd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2226f4e8a6651943e8f35d1a453b0e353fb4e562
Author: Julien Boibessot <jul...@ar...>
Date: Thu Aug 11 17:11:23 2011 +0200
[BUILDROOT] Moves all trivial armadeus rootfs specificities to a post build script
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 1 +
buildroot/configs/apf27_webradio_defconfig | 1 +
buildroot/configs/apf27test_defconfig | 1 +
buildroot/configs/apf51_defconfig | 1 +
buildroot/configs/apf51test_defconfig | 1 +
buildroot/configs/apf9328_defconfig | 1 +
buildroot/configs/apf9328test_defconfig | 1 +
buildroot/configs/pps_defconfig | 1 +
.../target/device/armadeus/rootfs/post_build.sh | 51 ++++++++++++++++++++
.../device/armadeus/rootfs/target_skeleton/dev/log | 1 -
.../armadeus/rootfs/target_skeleton/var/lib/pcmcia | 1 -
.../armadeus/rootfs/target_skeleton/var/lock | 1 -
.../device/armadeus/rootfs/target_skeleton/var/log | 1 -
.../armadeus/rootfs/target_skeleton/var/pcmcia | 1 -
.../device/armadeus/rootfs/target_skeleton/var/run | 1 -
.../armadeus/rootfs/target_skeleton/var/spool | 1 -
.../device/armadeus/rootfs/target_skeleton/var/tmp | 1 -
17 files changed, 59 insertions(+), 8 deletions(-)
create mode 100755 buildroot/target/device/armadeus/rootfs/post_build.sh
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/bin/.empty
delete mode 120000 buildroot/target/device/armadeus/rootfs/target_skeleton/dev/log
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/dev/pts/.empty
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/home/.empty
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/lib/firmware/.empty
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/media/mmc/.empty
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/media/usbdisk/.empty
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/flash/.empty
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/nfs/.empty
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/smb/.empty
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/opt/.empty
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/proc/.empty
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/sbin/.empty
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/sys/.empty
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/tmp/.empty
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/usr/bin/.empty
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/usr/lib/.empty
delete mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/usr/sbin/.empty
delete mode 120000 buildroot/target/device/armadeus/rootfs/target_skeleton/var/lib/pcmcia
delete mode 120000 buildroot/target/device/armadeus/rootfs/target_skeleton/var/lock
delete mode 120000 buildroot/target/device/armadeus/rootfs/target_skeleton/var/log
delete mode 120000 buildroot/target/device/armadeus/rootfs/target_skeleton/var/pcmcia
delete mode 120000 buildroot/target/device/armadeus/rootfs/target_skeleton/var/run
delete mode 120000 buildroot/target/device/armadeus/rootfs/target_skeleton/var/spool
delete mode 120000 buildroot/target/device/armadeus/rootfs/target_skeleton/var/tmp
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 04fe638..bdf73d3 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -61,6 +61,7 @@ BR2_PACKAGE_PORTMAP=y
BR2_PACKAGE_UUCP=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_NANO=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_ROOTFS_DEVICE_TABLE="$(ARMADEUS_PATH)/rootfs/device_table.txt"
BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index ea3300e..5da1b58 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -67,6 +67,7 @@ BR2_PACKAGE_NTP=y
BR2_PACKAGE_PORTMAP=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_NANO=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_ROOTFS_DEVICE_TABLE="$(ARMADEUS_PATH)/rootfs/device_table.txt"
BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 1106a9e..2c406e3 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -123,6 +123,7 @@ BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_NANO=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_ROOTFS_DEVICE_TABLE="$(ARMADEUS_PATH)/rootfs/device_table.txt"
BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 23409ad..1ef8502 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -72,6 +72,7 @@ BR2_PACKAGE_PPPD=y
BR2_PACKAGE_UUCP=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_NANO=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_ROOTFS_DEVICE_TABLE="$(ARMADEUS_PATH)/rootfs/device_table.txt"
BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 6df6330..ff446ca 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -125,6 +125,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_PACKAGE_NANO=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_ROOTFS_DEVICE_TABLE="$(ARMADEUS_PATH)/rootfs/device_table.txt"
BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index 5a0caf6..3d74f25 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -56,6 +56,7 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPD is not set
BR2_PACKAGE_PORTMAP=y
BR2_PACKAGE_NANO=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_ROOTFS_DEVICE_TABLE="$(ARMADEUS_PATH)/rootfs/device_table.txt"
BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 07fc863..c1d3d89 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -101,6 +101,7 @@ BR2_PACKAGE_NTP_NTPDATE=y
BR2_PACKAGE_PORTMAP=y
BR2_PACKAGE_TCPDUMP=y
BR2_PACKAGE_NANO=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_ROOTFS_DEVICE_TABLE="$(ARMADEUS_PATH)/rootfs/device_table.txt"
BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 86e044a..45fc8d0 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -67,6 +67,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_PACKAGE_NANO=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_ROOTFS_DEVICE_TABLE="$(ARMADEUS_PATH)/rootfs/device_table.txt"
BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
diff --git a/buildroot/target/device/armadeus/rootfs/post_build.sh b/buildroot/target/device/armadeus/rootfs/post_build.sh
new file mode 100755
index 0000000..13aec6f
--- /dev/null
+++ b/buildroot/target/device/armadeus/rootfs/post_build.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+#
+# Create custom directories and links of Armadeus rootfs
+#
+
+if [ ! -d "$1" ]; then
+ echo "Target directory ($1) not valid !"
+ exit 1
+fi
+
+# /bin
+mkdir -p $1/bin
+# /dev
+mkdir -p $1/dev/pts
+ln -sf /tmp/log $1/dev/log
+# /home
+mkdir -p $1/home
+# /lib
+mkdir -p $1/lib/firmware
+# /media
+mkdir -p $1/media/mmc
+mkdir -p $1/media/usbdisk
+# /mnt
+mkdir -p $1/mnt/flash
+mkdir -p $1/mnt/nfs
+mkdir -p $1/mnt/smb
+# /opt
+mkdir -p $1/opt
+# /proc
+mkdir -p $1/proc
+# /sbin
+mkdir -p $1/sbin
+# /sys
+mkdir -p $1/sys
+# /tmp
+mkdir -p $1/tmp
+# /usr
+mkdir -p $1/usr/bin
+mkdir -p $1/usr/lib
+mkdir -p $1/usr/sbin
+# /var
+mkdir -p $1/var/lib
+ln -sf /tmp $1/var/lib/pcmcia
+ln -sf /tmp $1/var/lock
+ln -sf /tmp $1/var/log
+ln -sf /tmp $1/var/pcmcia
+ln -sf /tmp $1/var/run
+ln -sf /tmp $1/var/spool
+ln -sf /tmp $1/var/tmp
+
+exit 0
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/bin/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/bin/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/dev/log b/buildroot/target/device/armadeus/rootfs/target_skeleton/dev/log
deleted file mode 120000
index 2835add..0000000
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/dev/log
+++ /dev/null
@@ -1 +0,0 @@
-/tmp/log
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/dev/pts/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/dev/pts/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/home/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/home/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/lib/firmware/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/lib/firmware/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/media/mmc/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/media/mmc/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/media/usbdisk/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/media/usbdisk/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/flash/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/flash/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/nfs/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/nfs/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/smb/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/smb/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/opt/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/opt/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/proc/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/proc/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/sbin/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/sbin/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/sys/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/sys/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/tmp/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/tmp/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/usr/bin/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/usr/bin/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/usr/lib/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/usr/lib/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/usr/sbin/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/usr/sbin/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lib/pcmcia b/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lib/pcmcia
deleted file mode 120000
index f1fde8c..0000000
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lib/pcmcia
+++ /dev/null
@@ -1 +0,0 @@
-../../tmp
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lock b/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lock
deleted file mode 120000
index 1431b0e..0000000
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lock
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/var/log b/buildroot/target/device/armadeus/rootfs/target_skeleton/var/log
deleted file mode 120000
index 1431b0e..0000000
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/var/log
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/var/pcmcia b/buildroot/target/device/armadeus/rootfs/target_skeleton/var/pcmcia
deleted file mode 120000
index 1431b0e..0000000
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/var/pcmcia
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/var/run b/buildroot/target/device/armadeus/rootfs/target_skeleton/var/run
deleted file mode 120000
index 1431b0e..0000000
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/var/run
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/var/spool b/buildroot/target/device/armadeus/rootfs/target_skeleton/var/spool
deleted file mode 120000
index 1431b0e..0000000
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/var/spool
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/var/tmp b/buildroot/target/device/armadeus/rootfs/target_skeleton/var/tmp
deleted file mode 120000
index 1431b0e..0000000
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/var/tmp
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file
hooks/post-receive
--
armadeus
|