* [Buildroot] svn commit: trunk/buildroot: package/busybox target/linux
@ 2007-09-26 22:12 ulf at uclibc.org
0 siblings, 0 replies; 2+ messages in thread
From: ulf at uclibc.org @ 2007-09-26 22:12 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-09-26 15:12:51 -0700 (Wed, 26 Sep 2007)
New Revision: 20047
Log:
Add more management to linux and buysbox packages
Modified:
trunk/buildroot/package/busybox/busybox.mk
trunk/buildroot/target/linux/Makefile.in
Changeset:
Modified: trunk/buildroot/package/busybox/busybox.mk
===================================================================
--- trunk/buildroot/package/busybox/busybox.mk 2007-09-26 22:11:25 UTC (rev 20046)
+++ trunk/buildroot/package/busybox/busybox.mk 2007-09-26 22:12:51 UTC (rev 20047)
@@ -28,8 +28,6 @@
$(DL_DIR)/$(BUSYBOX_SOURCE):
$(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
-busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE)
-
$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) -
ifeq ($(BR2_PACKAGE_SYSKLOGD),y)
@@ -127,8 +125,16 @@
busybox: uclibc $(TARGET_DIR)/bin/busybox
+busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE)
+
+busybox-unpacked: $(BUSYBOX_DIR)/.unpacked
+
+busybox-config: $(BUSYBOX_DIR)/.configured
+
busybox-menuconfig: host-sed $(PROJECT_BUILD_DIR) busybox-source $(BUSYBOX_DIR)/.configured
$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig
+
+busybox-update:
cp -f $(BUSYBOX_DIR)/.config $(BUSYBOX_CONFIG_FILE)
busybox-clean:
Modified: trunk/buildroot/target/linux/Makefile.in
===================================================================
--- trunk/buildroot/target/linux/Makefile.in 2007-09-26 22:11:25 UTC (rev 20046)
+++ trunk/buildroot/target/linux/Makefile.in 2007-09-26 22:12:51 UTC (rev 20047)
@@ -209,6 +209,11 @@
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) menuconfig
-[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured
+linux26-xconfig: $(LINUX26_DIR)/.patched host-sed
+ [ -f $(LINUX26_DIR)/.config ] || cp $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config
+ $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) xconfig
+ -[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured
+
linux26: $(LINUX26_KERNEL)
$(LINUX26_DIR)/.modules_installed: $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep
@@ -218,8 +223,10 @@
linux26-source: $(DL_DIR)/$(LINUX26_SOURCE)
-linux26-patched: $(LINUX26_DIR)/.patched
+linux26-unpacked: $(LINUX26_DIR)/.patched
+linux26-config: $(LINUX26_DIR)/.configured
+
# This has been renamed so we do _NOT_ by default run this on 'make clean'
linux26clean:
rm -f $(LINUX26_KERNEL) $(LINUX26_DIR)/.configured
^ permalink raw reply [flat|nested] 2+ messages in thread
* [Buildroot] svn commit: trunk/buildroot: package/busybox target/linux
@ 2007-09-02 21:50 aldot at uclibc.org
0 siblings, 0 replies; 2+ messages in thread
From: aldot at uclibc.org @ 2007-09-02 21:50 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-02 14:50:37 -0700 (Sun, 02 Sep 2007)
New Revision: 19766
Log:
- build and use the list of the small initramfs
Overriding the use of the whole system (as does the initramfs target) is done
on purpose.
Modified:
trunk/buildroot/package/busybox/initramfs.mk
trunk/buildroot/target/linux/Makefile.in
Changeset:
Modified: trunk/buildroot/package/busybox/initramfs.mk
===================================================================
--- trunk/buildroot/package/busybox/initramfs.mk 2007-09-02 20:58:51 UTC (rev 19765)
+++ trunk/buildroot/package/busybox/initramfs.mk 2007-09-02 21:50:37 UTC (rev 19766)
@@ -3,9 +3,11 @@
# busybox image for initramfs
#
#############################################################
+ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_INITRAMFS)),y)
BUSYBOX_INITRAMFS_DIR:=$(BUSYBOX_DIR)-initramfs
BR2_INITRAMFS_DIR:=$(PROJECT_BUILD_DIR)/initramfs
+BB_INITRAMFS_TARGET:=$(IMAGE).initramfs_lst
$(BUSYBOX_INITRAMFS_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
rm -rf $(BUILD_DIR)/tmp $(BUSYBOX_INITRAMFS_DIR)
@@ -34,6 +36,7 @@
echo CONFIG_FALSE=y; \
echo CONFIG_GUNZIP=y; \
echo CONFIG_HALT=y; \
+ echo CONFIG_INIT=y; \
echo CONFIG_INSMOD=y; \
echo CONFIG_KILL=y; \
echo CONFIG_LN=y; \
@@ -47,8 +50,8 @@
echo CONFIG_FEATURE_CHECK_TAINTED_MODULE=n; \
echo CONFIG_FEATURE_2_4_MODULES=n; \
echo CONFIG_MOUNT=y; \
- echo CONFIG_MSH=y; \
- echo CONFIG_FEATURE_SH_IS_MSH=y; \
+ echo CONFIG_ASH=y; \
+ echo CONFIG_FEATURE_SH_IS_ASH=y; \
echo CONFIG_PS=y; \
echo CONFIG_READLINK=y; \
echo CONFIG_RMMOD=y; \
@@ -97,7 +100,25 @@
install
$(STRIP) $(STRIP_STRIP_ALL) $@
-$(PROJECT_BUILD_DIR)/.initramfs_done: $(BR2_INITRAMFS_DIR)/bin/busybox
+
+$(BB_INITRAMFS_TARGET): $(BR2_INITRAMFS_DIR)/bin/busybox
+ ln -fs bin/busybox $(PROJECT_BUILD_DIR)/initramfs/init
+ mkdir -p $(PROJECT_BUILD_DIR)/initramfs/etc
+ cat target/generic/target_busybox_skeleton/etc/inittab > \
+ $(PROJECT_BUILD_DIR)/initramfs/etc/inittab
+ rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
+ (echo "chown -R 0:0 $(PROJECT_BUILD_DIR)/initramfs"; \
+ echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(PROJECT_BUILD_DIR)/initramfs"; \
+ echo "$(CONFIG_SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(PROJECT_BUILD_DIR)/initramfs > $(BB_INITRAMFS_TARGET)"; \
+ ) > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
+ chmod +x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
+ $(STAGING_DIR)/usr/bin/fakeroot -- \
+ $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
+ rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
+ touch -c $@
+
+$(PROJECT_BUILD_DIR)/.initramfs_done: $(BR2_INITRAMFS_DIR)/bin/busybox \
+ $(BB_INITRAMFS_TARGET)
touch $@
busybox-initramfs: uclibc $(PROJECT_BUILD_DIR)/.initramfs_done
@@ -107,12 +128,13 @@
busybox-initramfs-clean:
rm -f $(BUSYBOX_INITRAMFS_DIR)/busybox $(PROJECT_BUILD_DIR)/.initramfs_*
- rm -rf $(BR2_INITRAMFS_DIR)
+ rm -rf $(BR2_INITRAMFS_DIR) $(BB_INITRAMFS_TARGET)
-$(MAKE) -C $(BUSYBOX_INITRAMFS_DIR) clean
busybox-initramfs-dirclean:
rm -rf $(BUSYBOX_INITRAMFS_DIR) $(BR2_INITRAMFS_DIR) \
$(PROJECT_BUILD_DIR)/.initramfs_*
+endif
#############################################################
#
# Toplevel Makefile options
Modified: trunk/buildroot/target/linux/Makefile.in
===================================================================
--- trunk/buildroot/target/linux/Makefile.in 2007-09-02 20:58:51 UTC (rev 19765)
+++ trunk/buildroot/target/linux/Makefile.in 2007-09-02 21:50:37 UTC (rev 19766)
@@ -160,6 +160,14 @@
echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
endif
+ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y)
+ $(SED) '/CONFIG_INITRAMFS_SOURCE/d' $(LINUX26_DIR)/.config
+ echo "CONFIG_INITRAMFS_SOURCE=\"$(BB_INITRAMFS_TARGET)\"" >> \
+ $(LINUX26_DIR)/.config
+ $(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
+ echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
+ echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
+endif
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) oldconfig
touch $@
@@ -167,7 +175,8 @@
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) prepare
touch $@
-$(LINUX26_KERNEL): $(LINUX26_DIR)/.depend_done
+$(LINUX26_KERNEL): $(INITRAMFS_TARGET) $(BB_INITRAMFS_TARGET) \
+ $(LINUX26_DIR)/.depend_done
$(MAKE) $(LINUX26_MAKE_FLAGS) LZMA="$(LZMA)" \
-C $(LINUX26_DIR) $(LINUX26_FORMAT)
cp -dpf $(LINUX26_DIR)/$(LINUX26_BINLOC) $(LINUX26_KERNEL)
@@ -190,7 +199,7 @@
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) menuconfig
-[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured
-linux26: $(INITRAMFS_TARGET) $(LINUX26_KERNEL)
+linux26: $(LINUX26_KERNEL)
$(LINUX26_DIR)/.modules_installed: $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep
touch $@
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-09-26 22:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-26 22:12 [Buildroot] svn commit: trunk/buildroot: package/busybox target/linux ulf at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2007-09-02 21:50 aldot at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox