-include $(TOPDIR)/package/rules.mk
-
-IDIR_BASE:=$(PKG_BUILD_DIR)/base-files
-IPKG_BASE:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_RELEASE)_$(ARCH).ipk
-
-UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
-IDIR_UCLIBC:=$(PKG_BUILD_DIR)/uclibc
-IPKG_UCLIBC:=$(PACKAGE_DIR)/uclibc_$(UCLIBC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-
-LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version}
-IDIR_LIBGCC:=$(PKG_BUILD_DIR)/libgcc
-IPKG_LIBGCC:=$(PACKAGE_DIR)/libgcc_$(LIBGCC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-
-PACKAGES:=$(IPKG_BASE) $(IPKG_UCLIBC) $(IPKG_LIBGCC)
-
-$(PKG_BUILD_DIR)/.prepared:
- mkdir -p $(PKG_BUILD_DIR) $(PACKAGE_DIR)
- touch $@
-
-$(PKG_BUILD_DIR)/.built:
- touch $@
-
-$(IPKG_BASE):
- $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE) ipkg/$(PKG_NAME).control $(PKG_RELEASE) $(ARCH)
- cp -a ./default/* $(IDIR_BASE)
- $(SED) 's,$$R,r$(REV),g' $(IDIR_BASE)/etc/banner
- mkdir -p $(IDIR_BASE)/jffs
- mkdir -p $(IDIR_BASE)/dev
- mkdir -p $(IDIR_BASE)/proc
- mkdir -p $(IDIR_BASE)/tmp
- mkdir -p $(IDIR_BASE)/lib
- mkdir -p $(IDIR_BASE)/usr/lib
- mkdir -p $(IDIR_BASE)/usr/bin
- ln -sf /tmp/resolv.conf $(IDIR_BASE)/etc/resolv.conf
- rm -rf $(IDIR_BASE)/var
- ln -sf /tmp $(IDIR_BASE)/var
- -find $(IDIR_BASE) -type d -name CVS | xargs rm -rf
- -find $(IDIR_BASE) -type d -name .svn | xargs rm -rf
- -find $(IDIR_BASE) -name '.#*' | xargs rm -f
- mkdir -p $(IDIR_BASE)/etc
- -grep \^BR2_SYSCONF $(TOPDIR)/.config > $(IDIR_BASE)/etc/sysconf
- $(IPKG_BUILD) $(IDIR_BASE) $(PACKAGE_DIR)
-
-$(IPKG_UCLIBC):
- $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_UCLIBC) ipkg/uclibc.control $(UCLIBC_VERSION)-$(PKG_RELEASE) $(ARCH)
- mkdir -p $(IDIR_UCLIBC)/lib
+include $(INCLUDE_DIR)/package.mk
+
+ifneq ($(DUMP),1)
+TARGET:=-$(BOARD)-$(KERNEL)
+UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null}
+LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null}
+else
+UCLIBC_VERSION:=<UCLIBC_VERSION>
+LIBGCC_VERSION:=<LIBGCC_VERSION>
+endif
+
+CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
+
+define Package/base-files$(TARGET)
+ SECTION:=base
+ CATEGORY:=Base system
+ DEFAULT:=y
+ TITLE:=OpenWrt system scripts
+ DESCRIPTION:=Base filesystem for OpenWrt
+ VERSION:=$(PKG_RELEASE)-$(REV)
+endef
+
+define -ar7-2.4/conffiles
+/etc/config/network
+endef
+
+define -aruba-2.6/conffiles
+/etc/config/network
+endef
+
+define -au1000-2.6/conffiles
+/etc/config/network
+endef
+
+define -rb532-2.6/conffiles
+/etc/config/network
+endef
+
+define -sibyte-2.6/conffiles
+/etc/config/network
+endef
+
+define -x86-2.6/conffiles
+/etc/config/network
+endef
+
+define -xscale-2.6/conffiles
+/etc/config/network
+endef
+
+
+define Package/base-files$(TARGET)/conffiles
+/etc/banner
+/etc/hosts
+/etc/inittab
+/etc/group
+/etc/passwd
+/etc/profile
+/etc/shells
+/etc/ipkg.conf
+/etc/sysctl.conf
+$(call $(TARGET)/conffiles)
+endef
+
+define Package/libgcc
+ SECTION:=libs
+ CATEGORY:=Libraries
+ DEFAULT:=y
+ DEPENDS:=@!NATIVE_TOOLCHAIN
+ TITLE:=GCC support library
+ VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
+ DESCRIPTION:=$(TITLE)
+endef
+
+define Package/libpthread
+ $(call Package/base-files$(TARGET))
+ DEFAULT:=n
+ DEPENDS:=@!NATIVE_TOOLCHAIN
+ VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
+ TITLE:=POSIX thread library
+ DESCRIPTION:=POSIX thread library
+endef
+
+
+define Package/uclibc
+ $(call Package/base-files$(TARGET))
+ VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
+ DEPENDS:=@!NATIVE_TOOLCHAIN
+ TITLE:=C library
+ DESCRIPTION:=C library for embedded systems
+endef
+
+define Build/Prepare
+ mkdir -p $(PKG_BUILD_DIR)
+endef
+
+
+define Build/Compile/ar7
+ $(TARGET_CC) -o $(PKG_BUILD_DIR)/adam2patcher src/adam2patcher.c
+endef
+
+define Build/Compile/brcm
+ $(TARGET_CC) -o $(PKG_BUILD_DIR)/jffs2root src/jffs2root.c
+endef
+
+define Build/Compile
+ $(call Build/Compile/$(BOARD))
+endef
+
+
+define Package/base-files$(TARGET)/install-ar7
+ mkdir -p $(1)/sbin
+ $(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin
+endef
+define Package/base-files$(TARGET)/install-brcm
+ mkdir -p $(1)/sbin
+ $(CP) $(PKG_BUILD_DIR)/jffs2root $(1)/sbin
+endef
+
+define Package/base-files$(TARGET)/install
+ $(call Package/base-files$(TARGET)/install-$(BOARD),$(1))
+ $(CP) ./default/* $(1)/
+ if [ -d $(BOARD)-$(KERNEL) ]; then \
+ $(CP) $(BOARD)-$(KERNEL)/* $(1)/; \
+ fi
+ $(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner
+ $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' $(1)/etc/ipkg.conf
+ mkdir -p $(1)/dev
+ mkdir -p $(1)/etc/crontabs
+ mkdir -p $(1)/jffs
+ mkdir -p $(1)/lib
+ mkdir -p $(1)/mnt
+ mkdir -p $(1)/proc
+ mkdir -p $(1)/tmp
+ mkdir -p $(1)/usr/lib
+ mkdir -p $(1)/usr/bin
+ mkdir -p $(1)/sys
+ mkdir -p $(1)/www
+ ln -sf /proc/mounts $(1)/etc/mtab
+ rm -f $(1)/var
+ ln -sf /tmp $(1)/var
+ mkdir -p $(1)/etc
+endef
+
+define Package/libgcc/install
+ install -m0755 -d $(1)/lib
+ $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(1)/lib/
+endef
+
+define Package/libpthread/install
+ install -m0755 -d $(1)/lib
+ $(CP) $(STAGING_DIR)/lib/libpthread.so.* $(1)/lib/
+ $(CP) $(STAGING_DIR)/lib/libpthread-$(UCLIBC_VERSION).so $(1)/lib/
+endef
+
+define Package/uclibc/install
+ install -m0755 -d $(1)/lib