[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-77-g4de40f3
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-77-g4de40f3
|
From: Julien B a. A. <ar...@us...> - 2010-11-01 16:17:56
|
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 4de40f3390aa73f124b2a9c251d70ca237381ed3 (commit)
via fe73fcd50948b19f0bb30c2271f244d5f3cb0973 (commit)
from 0072a175cd67516b4c86b74f79433c4a45c61fb8 (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 4de40f3390aa73f124b2a9c251d70ca237381ed3
Author: Julien Boibessot <jul...@ar...>
Date: Mon Nov 1 17:16:53 2010 +0100
[BUILDROOT] [2010.11] Add UBI image generation support
commit fe73fcd50948b19f0bb30c2271f244d5f3cb0973
Author: Julien Boibessot <jul...@ar...>
Date: Mon Nov 1 16:47:07 2010 +0100
[BUILDROOT] [2010.11] remove add_packages_config_entry.pl
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 6 ++-
buildroot/configs/apf27_webradio_defconfig | 6 ++-
buildroot/configs/apf51_defconfig | 5 +-
.../2010.11/076-ubi-add_ubi_image_support.patch | 75 ++++++++++++++++++++
patches/buildroot/2010.11/076-ubifs.tofix | 66 -----------------
.../buildroot/2010.11/add_packages_config_entry.pl | 1 -
patches/buildroot/2010.11/cleanup_buildroot.sh | 1 +
7 files changed, 90 insertions(+), 70 deletions(-)
create mode 100644 patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch
delete mode 100644 patches/buildroot/2010.11/076-ubifs.tofix
delete mode 120000 patches/buildroot/2010.11/add_packages_config_entry.pl
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 2865fa3..dae7f48 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Oct 19 15:36:56 2010
+# Mon Nov 1 17:03:11 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -57,6 +57,7 @@ BR2_GCC_TARGET_ABI="aapcs-linux"
BR2_TARGET_ARMADEUS=y
# BR2_TARGET_ARMADEUS_APF9328 is not set
BR2_TARGET_ARMADEUS_APF27=y
+# BR2_TARGET_ARMADEUS_APF51 is not set
BR2_BOARD_NAME="apf27"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx27"
@@ -793,6 +794,9 @@ BR2_TARGET_ROOTFS_UBIFS_NONE=y
# BR2_TARGET_ROOTFS_UBIFS_GZIP is not set
# BR2_TARGET_ROOTFS_UBIFS_BZIP2 is not set
# BR2_TARGET_ROOTFS_UBIFS_LZMA is not set
+BR2_TARGET_ROOTFS_UBI=y
+BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x20000
+BR2_TARGET_ROOTFS_UBI_SUBSIZE=512
# BR2_TARGET_ROOTFS_SQUASHFS is not set
BR2_TARGET_ROOTFS_TAR=y
BR2_TARGET_ROOTFS_TAR_NONE=y
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index bf93631..1c55543 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Oct 19 15:36:56 2010
+# Mon Nov 1 17:07:31 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -57,6 +57,7 @@ BR2_GCC_TARGET_ABI="aapcs-linux"
BR2_TARGET_ARMADEUS=y
# BR2_TARGET_ARMADEUS_APF9328 is not set
BR2_TARGET_ARMADEUS_APF27=y
+# BR2_TARGET_ARMADEUS_APF51 is not set
BR2_BOARD_NAME="apf27"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx27"
@@ -860,6 +861,9 @@ BR2_TARGET_ROOTFS_UBIFS_NONE=y
# BR2_TARGET_ROOTFS_UBIFS_GZIP is not set
# BR2_TARGET_ROOTFS_UBIFS_BZIP2 is not set
# BR2_TARGET_ROOTFS_UBIFS_LZMA is not set
+BR2_TARGET_ROOTFS_UBI=y
+BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x20000
+BR2_TARGET_ROOTFS_UBI_SUBSIZE=512
# BR2_TARGET_ROOTFS_SQUASHFS is not set
BR2_TARGET_ROOTFS_TAR=y
BR2_TARGET_ROOTFS_TAR_NONE=y
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 8269e48..6521718 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Oct 21 14:12:52 2010
+# Mon Nov 1 17:03:11 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -792,6 +792,9 @@ BR2_TARGET_ROOTFS_UBIFS_NONE=y
# BR2_TARGET_ROOTFS_UBIFS_GZIP is not set
# BR2_TARGET_ROOTFS_UBIFS_BZIP2 is not set
# BR2_TARGET_ROOTFS_UBIFS_LZMA is not set
+BR2_TARGET_ROOTFS_UBI=y
+BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x20000
+BR2_TARGET_ROOTFS_UBI_SUBSIZE=512
# BR2_TARGET_ROOTFS_SQUASHFS is not set
BR2_TARGET_ROOTFS_TAR=y
BR2_TARGET_ROOTFS_TAR_NONE=y
diff --git a/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch b/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch
new file mode 100644
index 0000000..4a6b020
--- /dev/null
+++ b/patches/buildroot/2010.11/076-ubi-add_ubi_image_support.patch
@@ -0,0 +1,75 @@
+Add support to generate UBI images from UBIFS one.
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/fs/ubi/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/fs/ubi/Config.in 2010-10-31 21:32:10.000000000 +0100
+@@ -0,0 +1,22 @@
++config BR2_TARGET_ROOTFS_UBI
++ depends on BR2_TARGET_ROOTFS_UBIFS
++ bool "UBI image"
++ help
++ Build a UBI image of the UBIFS root filesystem.
++
++config BR2_TARGET_ROOTFS_UBI_PEBSIZE
++ hex "UBI physical erase block size"
++ depends on BR2_TARGET_ROOTFS_UBI
++ default 0x20000
++ help
++ Tells ubinize that physical eraseblock size of the flash chip the UBI
++ image is created for is 0x20000 (by default).
++
++config BR2_TARGET_ROOTFS_UBI_SUBSIZE
++ int "UBI sub-page size"
++ depends on BR2_TARGET_ROOTFS_UBI
++ default 512
++ help
++ Tells ubinize that the flash supports sub-pages and sub-page size is
++ 512 bytes (by default).
++
+Index: buildroot/fs/ubi/ubi.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/fs/ubi/ubi.mk 2010-10-31 21:56:04.000000000 +0100
+@@ -0,0 +1,26 @@
++#############################################################
++#
++# Build the UBI root filesystem image
++#
++#############################################################
++
++UBI_UBINIZE_OPTS := -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE)
++UBI_UBINIZE_OPTS += -p $(BR2_TARGET_ROOTFS_UBI_PEBSIZE)
++ifneq ($(BR2_TARGET_ROOTFS_UBI_SUBSIZE),0)
++UBI_UBINIZE_OPTS += -s $(BR2_TARGET_ROOTFS_UBI_SUBSIZE)
++endif
++
++
++ROOTFS_UBI_DEPENDENCIES = ubifs-root
++
++# $(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $$@
++
++define ROOTFS_UBI_CMD
++ cp fs/ubi/ubinize.cfg . ;\
++ echo "image=$$@fs" \
++ >> ./ubinize.cfg ;\
++ $(HOST_DIR)/usr/sbin/ubinize -o $$@ $(UBI_UBINIZE_OPTS) ubinize.cfg ;\
++ rm ubinize.cfg
++endef
++
++$(eval $(call ROOTFS_TARGET,ubi))
+Index: buildroot/fs/ubi/ubinize.cfg
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/fs/ubi/ubinize.cfg 2010-10-31 21:13:58.000000000 +0100
+@@ -0,0 +1,7 @@
++[ubifs]
++mode=ubi
++vol_id=0
++vol_type=dynamic
++vol_name=rootfs
++vol_alignment=1
++vol_flags=autoresize
diff --git a/patches/buildroot/2010.11/076-ubifs.tofix b/patches/buildroot/2010.11/076-ubifs.tofix
deleted file mode 100644
index bbd70f9..0000000
--- a/patches/buildroot/2010.11/076-ubifs.tofix
+++ /dev/null
@@ -1,66 +0,0 @@
---- buildrootref/fs/ubifs/Config.in 2008-11-03 09:15:09.000000000 +0100
-+++ buildroot/fs/ubifs/Config.in 2009-10-03 17:07:32.000000000 +0200
-@@ -1,6 +1,11 @@
- help
- Build a ubifs root filesystem
-
-+config BR2_TARGET_ROOTFS_UBIFS_PEBSIZE
-+ hex "UBI physical erase block size"
-+ depends on BR2_TARGET_ROOTFS_UBIFS
-+ default 0x20000
-+
- config BR2_TARGET_ROOTFS_UBIFS_LEBSIZE
- hex "UBI logical erase block size"
- depends on BR2_TARGET_ROOTFS_UBIFS
-@@ -17,6 +23,13 @@ config BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE
- help
- Some comment required here
-
-+config BR2_TARGET_ROOTFS_UBIFS_SUBSIZE
-+ int "UBI sub-page size"
-+ depends on BR2_TARGET_ROOTFS_UBIFS
-+ default 512
-+ help
-+ Some comment required here
-+
- config BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT
- int "Maximum LEB count"
- depends on BR2_TARGET_ROOTFS_UBIFS
---- buildrootref/fs/ubifs/ubifs.mk 2009-10-03 17:55:26.000000000 +0200
-+++ buildroot/fs/ubifs/ubifs.mk 2009-10-03 17:18:09.000000000 +0200
-@@ -75,7 +75,14 @@ else
- UBIFS_TARGET := $(UBIFS_BASE)
- endif
-
--$(UBIFS_BASE): host-fakeroot makedevs mkfs.ubifs
-+UBIFS_UBINIZE_OPTS := -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE) -p $(BR2_TARGET_ROOTFS_UBIFS_PEBSIZE)
-+
-+ifneq ($(BR2_TARGET_ROOTFS_UBIFS_SUBSIZE),0)
-+UBIFS_UBINIZE_OPTS += -s $(BR2_TARGET_ROOTFS_UBIFS_SUBSIZE)
-+endif
-+
-+
-+$(UBIFS_BASE): host-fakeroot makedevs
- # Use fakeroot to pretend all target binaries are owned by root
- rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
- touch $(BUILD_DIR)/.fakeroot.00000
-@@ -80,11 +87,18 @@ ifneq ($(TARGET_DEVICE_TABLE),)
- >> $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
- endif
- # Use fakeroot so mkfs.ubifs believes the previous fakery
-- echo "$(MKFS_UBIFS_DIR)/mkfs.ubifs -d $(TARGET_DIR) " \
-+ echo "$(MKFS_UBIFS) -d $(TARGET_DIR) " \
- "$(UBIFS_OPTS) -o $(UBIFS_BASE)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
- chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
- $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
- -@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
-+ cp target/ubifs/ubinize.cfg .
-+ echo "image=$(UBIFS_BASE)" \
-+ >> ./ubinize.cfg
-+ $(UBINIZE) -o system_ubi.img $(UBIFS_UBINIZE_OPTS) ubinize.cfg
-+ cp -f system_ubi.img $(UBIFS_BASE)
-+ rm system_ubi.img
-+ rm ubinize.cfg
-
- ifneq ($(UBIFS_ROOTFS_COMPRESSOR),)
- $(UBIFS_BASE).$(UBIFS_ROOTFS_COMPRESSOR_EXT): $(UBIFS_ROOTFS_COMPRESSOR_PREREQ) $(UBIFS_BASE)
diff --git a/patches/buildroot/2010.11/add_packages_config_entry.pl b/patches/buildroot/2010.11/add_packages_config_entry.pl
deleted file mode 120000
index cba56cc..0000000
--- a/patches/buildroot/2010.11/add_packages_config_entry.pl
+++ /dev/null
@@ -1 +0,0 @@
-../add_packages_config_entry.pl
\ No newline at end of file
diff --git a/patches/buildroot/2010.11/cleanup_buildroot.sh b/patches/buildroot/2010.11/cleanup_buildroot.sh
index e3f2cfe..14fe7f9 100755
--- a/patches/buildroot/2010.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.11/cleanup_buildroot.sh
@@ -47,3 +47,4 @@ rm -rf buildroot/package/ipsec-tools/
rm -rf buildroot/package/lbreakout2/
rm -rf buildroot/package/ltris/
rm -rf buildroot/package/qwt/
+rm -rf buildroot/fs/ubi/
hooks/post-receive
--
armadeus
|
