diff options
35 files changed, 87986 insertions, 32682 deletions
@@ -32,23 +32,9 @@ config ADK_HOST config ADK_DEVELSYSTEM bool "Compile a ADK development system" default n - select BUSYBOX_CMP - select BUSYBOX_COMM - select BUSYBOX_EXPR - select BUSYBOX_INSTALL - select BUSYBOX_MKTEMP - select BUSYBOX_UNZIP - select BUSYBOX_RMDIR - select BUSYBOX_SPLIT - select BUSYBOX_TAC - select BUSYBOX_TEE - select BUSYBOX_WGET - select BUSYBOX_YES - select BUSYBOX_TRUE select ADK_PACKAGE_BASH select ADK_PACKAGE_BINUTILS select ADK_PACKAGE_BZIP2 - select ADK_PACKAGE_CPIO select ADK_PACKAGE_DIFFUTILS select ADK_PACKAGE_FILE select ADK_PACKAGE_GAWK @@ -82,7 +68,7 @@ config ADK_DEBUG default n help All packages and libc will be compiled and packaged with debug information. - Mostly useful for NFS root or big USB/CF disk setups. + Mostly useful for NFS root or big USB/CF or hard disk setups. config ADK_STATIC bool "Link applications statically by default" @@ -153,6 +139,76 @@ config ADK_HOST_CYGWIN endchoice +choice +prompt "Hardware profile (autodetection on OpenADK systems)" +config ADK_HARDWARE_NOPROFILE + bool "no profile" + +config ADK_HARDWARE_IBMX40 + bool "IBM X40 laptop" + select ADK_TARGET_WITH_USB + select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_INPUT + select ADK_TARGET_WITH_RTC + select ADK_TARGET_WITH_HDD + select ADK_KERNEL_NLS + select ADK_KERNEL_EXT2_FS + select ADK_KERNEL_SCSI + select ADK_KERNEL_ATA + select ADK_KERNEL_BLK_DEV_SD + select ADK_KERNEL_INPUT_KEYBOARD + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_PCI + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_MII + select ADK_KERNEL_SWAP + select ADK_KPACKAGE_KMOD_MAC80211 + select ADK_KPACKAGE_KMOD_ATH5K + select ADK_KERNEL_MAC80211_LEDS + select ADK_KERNEL_ATH_COMMON + select ADK_KPACKAGE_KMOD_SND + select ADK_KPACKAGE_KMOD_SND_OSSEMUL + select ADK_PACKAGE_KMOD_USB_CONTROLLER + select ADK_KPACKAGE_KMOD_USB + select ADK_KPACKAGE_KMOD_USB_EHCI_HCD + select ADK_KPACKAGE_KMOD_USB_OHCI_HCD + help + Hardware profile for IBM X40 laptop's. + +config ADK_HARDWARE_YEELONG + bool "Yeelong laptop" + select ADK_TARGET_WITH_USB + select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_INPUT + select ADK_TARGET_WITH_RTC + select ADK_TARGET_WITH_HDD + select ADK_KERNEL_NLS + select ADK_KERNEL_EXT2_FS + select ADK_KERNEL_SCSI + select ADK_KERNEL_ATA + select ADK_KERNEL_BLK_DEV_SD + select ADK_KERNEL_INPUT_KEYBOARD + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_PCI + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_MII + select ADK_KERNEL_SWAP + select ADK_KPACKAGE_KMOD_MAC80211 + select ADK_KPACKAGE_KMOD_EEPROM_93CX6 + select ADK_KPACKAGE_KMOD_RTL8187 + select ADK_KPACKAGE_KMOD_SND + select ADK_KPACKAGE_KMOD_SND_CS5535AUDIO + select ADK_KPACKAGE_KMOD_SND_OSSEMUL + select ADK_PACKAGE_KMOD_USB_CONTROLLER + select ADK_KPACKAGE_KMOD_USB + select ADK_KPACKAGE_KMOD_USB_EHCI_HCD + select ADK_KPACKAGE_KMOD_USB_OHCI_HCD + help + Hardware profile for Lemotes Yeelong laptop. + Selects drivers for wireless card, usb controller and sound card. + +endchoice + endmenu source "target/Config.in" @@ -61,9 +61,6 @@ pkg-help: @echo 'This does not automatically resolve package dependencies!' dev-help: - @echo 'Regenerate menu information via "make menu"' - @echo 'Regenerate dependency information via "make dep"' - @echo @echo 'Fast way of updating package patches:' @echo ' run "make package=<pkgname> clean" to start with a good base' @echo ' run "make package=<pkgname> patch" to fetch, unpack and patch the source' @@ -221,6 +218,7 @@ NO_ERROR=0 @echo 'LC_ALL:=C' >>prereq.mk @echo 'MAKE:=$${GMAKE}' >>prereq.mk @echo "OStype:=$$(env uname)" >>prereq.mk + @echo "ADKtype:=$$(cat /etc/adktarget)" >>prereq.mk @echo "_PATH:=$$PATH" >>prereq.mk @echo "PATH:=\$${TOPDIR}/scripts:/usr/sbin:$$PATH" >>prereq.mk @echo "SHELL:=$$(which bash)" >>prereq.mk diff --git a/mk/build.mk b/mk/build.mk index f71808b3f..a7a464394 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -164,9 +164,15 @@ switch: else echo "No old target config found";mv .config .config.bak; make TARGET=${TARGET};fi kernelconfig: +ifeq ($(ADKtype),) cp $(TOPDIR)/target/$(ADK_TARGET)/kernel.config $(BUILD_DIR)/linux/.config $(MAKE) -C $(BUILD_DIR)/linux/ ARCH=$(ARCH) menuconfig cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADK_TARGET)/kernel.config +else + cp $(TOPDIR)/target/$(ADKtype)/kernel.config $(BUILD_DIR)/linux/.config + $(MAKE) -C $(BUILD_DIR)/linux/ ARCH=$(ARCH) menuconfig + cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADKtype)/kernel.config +endif # create a new package from package/.template newpackage: @@ -294,6 +300,12 @@ endif ifneq (,$(filter CYGWIN%,${OStype})) @echo ADK_HOST_CYGWIN=y > $(TOPDIR)/.defconfig endif +ifeq ($(ADKtype),ibmx40) + @echo ADK_HARDWARE_IBMX40=y >> $(TOPDIR)/.defconfig +endif +ifeq ($(ADKtype),lemote) + @echo ADK_HARDWARE_YEELONG=y >> $(TOPDIR)/.defconfig +endif @if [ ! -z "$(TARGET)" ];then \ grep "^config" target/Config.in \ |grep -i "$(TARGET)"\$$ \ @@ -365,6 +377,12 @@ endif ifneq (,$(filter CYGWIN%,${OStype})) @echo ADK_HOST_CYGWIN=y > $(TOPDIR)/all.config endif +ifeq ($(ADKtype),ibmx40) + @echo ADK_HARDWARE_IBMX40=y >> $(TOPDIR)/all.config +endif +ifeq ($(ADKtype),lemote) + @echo ADK_HARDWARE_YEELONG=y >> $(TOPDIR)/all.config +endif @if [ ! -z "$(TARGET)" ];then \ grep "^config" target/Config.in \ |grep -i "$(TARGET)"\$$ \ diff --git a/mk/image.mk b/mk/image.mk index 6c3b1e5f9..1ca9ac29b 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -22,7 +22,7 @@ image-prepare-post: fi KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg -KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(ADK_TARGET)-$(KERNEL_VERSION)_$(CPU_ARCH).$(PKG_SUFFIX) +KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(KERNEL_VERSION)_$(CPU_ARCH).$(PKG_SUFFIX) kernel-package: $(LINUX_DIR)/vmlinux $(TRACE) target/$(ADK_TARGET)-create-kernel-package @@ -30,7 +30,7 @@ kernel-package: $(LINUX_DIR)/vmlinux @mkdir -p $(KERNEL_PKGDIR)/boot cp $(KERNEL) $(KERNEL_PKGDIR)/boot/vmlinuz-adk @${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_PKGDIR} \ - ../linux/kernel.control ${ADK_TARGET}-${KERNEL_VERSION} ${CPU_ARCH} + ../linux/kernel.control ${KERNEL_VERSION} ${CPU_ARCH} $(PKG_BUILD) $(KERNEL_PKGDIR) $(PACKAGE_DIR) $(MAKE_TRACE) $(TRACE) target/$(ADK_TARGET)-install-kernel-package $(PKG_INSTALL) $(KERNEL_PKG) $(MAKE_TRACE) diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 8ee6d1ac3..68fe897a3 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -9,6 +9,12 @@ $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNE $(TRACE) target/$(ADK_TARGET)-kernel-patch $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) ../linux/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE) $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) ../$(ADK_TARGET)/patches *.patch $(MAKE_TRACE) +ifeq ($(ADK_NATIVE),y) + if [ -f /etc/adktarget ];then \ + target=$$(cat /etc/adktarget); \ + $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) ../$$target/patches *.patch $(MAKE_TRACE); \ + fi +endif touch $@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched @@ -17,7 +23,7 @@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PK mkdir -p $(LINUX_BUILD_DIR)/kmod-control touch $@ -$(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig +$(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR)/mk/modules.mk $(TRACE) target/$(ADK_TARGET)-kernel-configure for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done $(MAKE_TRACE) $(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config @@ -27,11 +33,12 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config $(TRACE) target/$(ADK_TARGET)-kernel-compile - $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} $(MAKE_TRACE) + $(MAKE) LOCALVERSION="" ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} $(MAKE_TRACE) $(TRACE) target/$(ADK_TARGET)-kernel-modules-install rm -rf $(LINUX_BUILD_DIR)/modules $(MAKE) ${KERNEL_MAKE_OPTS} DEPMOD=true \ INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \ + LOCALVERSION="" \ modules_install $(MAKE_TRACE) $(TRACE) target/$(ADK_TARGET)-create-packages ifneq ($(strip $(TARGETS)),) diff --git a/mk/kernel.mk b/mk/kernel.mk index a8b3884da..eb4e52a33 100644 --- a/mk/kernel.mk +++ b/mk/kernel.mk @@ -28,9 +28,9 @@ TARGETS:= # define KMOD_template -IDEPENDK_$(1):=kernel ($(ADK_TARGET)-$(KERNEL_VERSION)) $(foreach pkg,$(5),", $(pkg)") +IDEPENDK_$(1):=kernel ($(KERNEL_VERSION)) $(foreach pkg,$(5),", $(pkg)") -PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(ADK_TARGET)-$(KERNEL_VERSION)-$(KERNEL_RELEASE)_$(CPU_ARCH).$(PKG_SUFFIX) +PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(KERNEL_VERSION)-$(KERNEL_RELEASE)_$(CPU_ARCH).$(PKG_SUFFIX) I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2) ifeq ($$(ADK_KPACKAGE_KMOD_$(1)),m) @@ -50,7 +50,7 @@ $$(PKG_$(1)): echo "Description: kernel module $(2)" >> $(LINUX_BUILD_DIR)/kmod-control/kmod-$(2).control ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $$(I_$(1)) \ $(LINUX_BUILD_DIR)/kmod-control/kmod-$(2).control \ - $(ADK_TARGET)-$(KERNEL_VERSION)-$(KERNEL_RELEASE) $(CPU_ARCH) + $(KERNEL_VERSION)-$(KERNEL_RELEASE) $(CPU_ARCH) echo "Depends: $$(IDEPENDK_$(1))" >> $$(I_$(1))/CONTROL/control ifneq ($(strip $(3)),) mkdir -p $$(I_$(1))/lib/modules/$(KERNEL_VERSION) diff --git a/mk/modules.mk b/mk/modules.mk index 10f9a6266..aac667376 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -61,7 +61,7 @@ $(eval $(call KMOD_template,SKY2,sky2,\ $(eval $(call KMOD_template,MAC80211,mac80211,\ $(MODULES_DIR)/kernel/net/wireless/cfg80211 \ $(MODULES_DIR)/kernel/net/mac80211/mac80211 \ -,15, kmod-crypto-aes kmod-crypto-arc4 kmod-crypto-ecb kmod-crc32)) +,15, kmod-crypto-aes kmod-crypto-arc4 kmod-crypto-ecb)) $(eval $(call KMOD_template,ATH5K,ath5k,\ $(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath \ @@ -72,8 +72,8 @@ $(eval $(call KMOD_template,P54_COMMON,p54-common,\ $(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54common \ ,68)) -$(eval $(call KMOD_template,RTL8187B,rtl8187b,\ - $(MODULES_DIR)/kernel/drivers/net/wireless/rtl8187b/rtl8187b \ +$(eval $(call KMOD_template,RTL8187,rtl8187,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/rtl818x/rtl8187 \ ,70)) $(eval $(call KMOD_template,B43,b43,\ diff --git a/mk/package.mk b/mk/package.mk index 30965e17b..0fa82fbba 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -77,10 +77,11 @@ MAKE_ENV+= WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \ CXXFLAGS='$(strip ${TCXXFLAGS})' \ CPPFLAGS='$(strip ${TCPPFLAGS})' \ LDFLAGS='$(strip ${TLDFLAGS})' +MAKE_ENV+= PATH='${TARGET_PATH}' ifeq ($(ADK_NATIVE),) MAKE_ENV+= PATH='${TARGET_PATH}' \ - ${HOST_CONFIGURE_OPTS} \ PKG_CONFIG_LIBDIR='${STAGING_DIR}/usr/lib/pkgconfig' \ + ${HOST_CONFIGURE_OPTS} \ CC='${TARGET_CC}' \ CXX='${TARGET_CXX}' \ AR='${TARGET_CROSS}ar' \ @@ -208,7 +209,7 @@ ifeq (,$(filter noremove,$(7))) fi endif @rm -f '$${STAGING_PARENT}/pkg/$(1)' - @-cd $${IDIR_$(1)}; \ + -cd $${IDIR_$(1)}; \ x=$$$$(find tmp var -mindepth 1 2>/dev/null); if [[ -n $$$$x ]]; then \ echo 'WARNING: $${IPKG_$(1)} installs files into a' \ 'ramdisk location:' >&2; \ diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in index 2aaf7ee9f..bf0d9d8c0 100644 --- a/package/busybox/config/Config.in +++ b/package/busybox/config/Config.in @@ -369,7 +369,7 @@ config BUSYBOX_BUILD_LIBBUSYBOX config BUSYBOX_FEATURE_INDIVIDUAL bool "Produce a binary for each applet, linked against libbusybox" - default y + default n depends on BUSYBOX_BUILD_LIBBUSYBOX help If your CPU architecture doesn't allow for sharing text/rodata @@ -387,7 +387,7 @@ config BUSYBOX_FEATURE_INDIVIDUAL config BUSYBOX_FEATURE_SHARED_BUSYBOX bool "Produce additional busybox binary linked against libbusybox" - default y + default n depends on BUSYBOX_BUILD_LIBBUSYBOX help Build busybox, dynamically linked against libbusybox.so.N.N.N. diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in index 85d4342e5..75130fcad 100644 --- a/package/busybox/config/coreutils/Config.in +++ b/package/busybox/config/coreutils/Config.in @@ -74,7 +74,7 @@ config BUSYBOX_CKSUM config BUSYBOX_COMM bool "comm" - default n + default y help comm is used to compare two files line by line and return a three-column output. @@ -263,7 +263,7 @@ config BUSYBOX_FEATURE_EXPAND_LONG_OPTIONS config BUSYBOX_EXPR bool "expr" - default n + default y help expr is used to calculate numbers and print the result to standard output. @@ -324,7 +324,7 @@ config BUSYBOX_ID config BUSYBOX_INSTALL bool "install" - default n + default y help Copy files and set attributes. @@ -479,7 +479,7 @@ config BUSYBOX_NOHUP config BUSYBOX_OD bool "od" - default n + default y help od is used to dump binary files in octal and other formats. @@ -531,7 +531,7 @@ config BUSYBOX_RM config BUSYBOX_RMDIR bool "rmdir" - default n + default y help rmdir is used to remove empty directories. @@ -615,7 +615,7 @@ config BUSYBOX_FEATURE_SORT_BIG config BUSYBOX_SPLIT bool "split" - default n + default y help split a file into pieces. @@ -663,7 +663,7 @@ config BUSYBOX_SYNC config BUSYBOX_TAC bool "tac" - default n + default y help tac is used to concatenate and print files in reverse. @@ -684,7 +684,7 @@ config BUSYBOX_FEATURE_FANCY_TAIL config BUSYBOX_TEE bool "tee" - default n + default y help tee is used to read from standard input and write to standard output and files. @@ -746,7 +746,7 @@ config BUSYBOX_FEATURE_TR_EQUIV config BUSYBOX_TRUE bool "true" - default n + default y help true returns an exit code of TRUE (0). @@ -830,7 +830,7 @@ config BUSYBOX_WHOAMI config BUSYBOX_YES bool "yes" - default n + default y help yes is used to repeatedly output a specific string, or the default string `y'. diff --git a/package/busybox/config/debianutils/Config.in b/package/busybox/config/debianutils/Config.in index 9246370ca..891d194e0 100644 --- a/package/busybox/config/debianutils/Config.in +++ b/package/busybox/config/debianutils/Config.in @@ -7,7 +7,7 @@ menu "Debian Utilities" config BUSYBOX_MKTEMP bool "mktemp" - default n + default y help mktemp is used to create unique temporary files diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in index 598514d95..52594b0ef 100644 --- a/package/busybox/config/editors/Config.in +++ b/package/busybox/config/editors/Config.in @@ -22,7 +22,7 @@ config BUSYBOX_FEATURE_AWK_LIBM config BUSYBOX_CMP bool "cmp" - default n + default y help cmp is used to compare two files and returns the result to standard output. diff --git a/package/busybox/patches/006-od-bloat.patch b/package/busybox/patches/006-od-bloat.patch new file mode 100644 index 000000000..8c608ca87 --- /dev/null +++ b/package/busybox/patches/006-od-bloat.patch @@ -0,0 +1,214 @@ +diff -Nur busybox-1.17.1.orig/coreutils/od.c busybox-1.17.1/coreutils/od.c +--- busybox-1.17.1.orig/coreutils/od.c 2010-07-06 04:25:53.000000000 +0200 ++++ busybox-1.17.1/coreutils/od.c 2010-08-15 12:50:31.000000000 +0200 +@@ -13,210 +13,5 @@ + + + #include "libbb.h" +-#if ENABLE_DESKTOP + /* This one provides -t (busybox's own build script needs it) */ + #include "od_bloaty.c" +-#else +- +-#include "dump.h" +- +-static void +-odoffset(dumper_t *dumper, int argc, char ***argvp) +-{ +- char *num, *p; +- int base; +- char *end; +- +- /* +- * The offset syntax of od(1) was genuinely bizarre. First, if +- * it started with a plus it had to be an offset. Otherwise, if +- * there were at least two arguments, a number or lower-case 'x' +- * followed by a number makes it an offset. By default it was +- * octal; if it started with 'x' or '0x' it was hex. If it ended +- * in a '.', it was decimal. If a 'b' or 'B' was appended, it +- * multiplied the number by 512 or 1024 byte units. There was +- * no way to assign a block count to a hex offset. +- * +- * We assumes it's a file if the offset is bad. +- */ +- p = **argvp; +- +- if (!p) { +- /* hey someone is probably piping to us ... */ +- return; +- } +- +- if ((*p != '+') +- && (argc < 2 +- || (!isdigit(p[0]) +- && ((p[0] != 'x') || !isxdigit(p[1]))))) +- return; +- +- base = 0; +- /* +- * skip over leading '+', 'x[0-9a-fA-f]' or '0x', and +- * set base. +- */ +- if (p[0] == '+') +- ++p; +- if (p[0] == 'x' && isxdigit(p[1])) { +- ++p; +- base = 16; +- } else if (p[0] == '0' && p[1] == 'x') { +- p += 2; +- base = 16; +- } +- +- /* skip over the number */ +- if (base == 16) +- for (num = p; isxdigit(*p); ++p) +- continue; +- else +- for (num = p; isdigit(*p); ++p) +- continue; +- +- /* check for no number */ +- if (num == p) +- return; +- +- /* if terminates with a '.', base is decimal */ +- if (*p == '.') { +- if (base) +- return; +- base = 10; +- } +- +- dumper->dump_skip = strtol(num, &end, base ? base : 8); +- +- /* if end isn't the same as p, we got a non-octal digit */ +- if (end != p) +- dumper->dump_skip = 0; +- else { +- if (*p) { +- if (*p == 'b') { +- dumper->dump_skip *= 512; +- ++p; +- } else if (*p == 'B') { +- dumper->dump_skip *= 1024; +- ++p; +- } +- } +- if (*p) +- dumper->dump_skip = 0; +- else { +- ++*argvp; +- /* +- * If the offset uses a non-octal base, the base of +- * the offset is changed as well. This isn't pretty, +- * but it's easy. +- */ +-#define TYPE_OFFSET 7 +- { +- char x_or_d; +- if (base == 16) { +- x_or_d = 'x'; +- goto DO_X_OR_D; +- } +- if (base == 10) { +- x_or_d = 'd'; +- DO_X_OR_D: +- dumper->fshead->nextfu->fmt[TYPE_OFFSET] +- = dumper->fshead->nextfs->nextfu->fmt[TYPE_OFFSET] +- = x_or_d; +- } +- } +- } +- } +-} +- +-static const char *const add_strings[] = { +- "16/1 \"%3_u \" \"\\n\"", /* a */ +- "8/2 \" %06o \" \"\\n\"", /* B, o */ +- "16/1 \"%03o \" \"\\n\"", /* b */ +- "16/1 \"%3_c \" \"\\n\"", /* c */ +- "8/2 \" %05u \" \"\\n\"", /* d */ +- "4/4 \" %010u \" \"\\n\"", /* D */ +- "2/8 \" %21.14e \" \"\\n\"", /* e (undocumented in od), F */ +- "4/4 \" %14.7e \" \"\\n\"", /* f */ +- "4/4 \" %08x \" \"\\n\"", /* H, X */ +- "8/2 \" %04x \" \"\\n\"", /* h, x */ +- "4/4 \" %11d \" \"\\n\"", /* I, L, l */ +- "8/2 \" %6d \" \"\\n\"", /* i */ +- "4/4 \" %011o \" \"\\n\"", /* O */ +-}; +- +-static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxv"; +- +-static const char od_o2si[] ALIGN1 = { +- 0, 1, 2, 3, 5, +- 4, 6, 6, 7, 8, +- 9, 0xa, 0xb, 0xa, 0xa, +- 0xb, 1, 8, 9, +-}; +- +-int od_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +-int od_main(int argc, char **argv) +-{ +- int ch; +- int first = 1; +- char *p; +- dumper_t *dumper = alloc_dumper(); +- +- while ((ch = getopt(argc, argv, od_opts)) > 0) { +- if (ch == 'v') { +- dumper->dump_vflag = ALL; +- } else if (((p = strchr(od_opts, ch)) != NULL) && (*p != '\0')) { +- if (first) { +- first = 0; +- bb_dump_add(dumper, "\"%07.7_Ao\n\""); +- bb_dump_add(dumper, "\"%07.7_ao \""); +- } else { +- bb_dump_add(dumper, "\" \""); +- } +- bb_dump_add(dumper, add_strings[(int)od_o2si[(p - od_opts)]]); +- } else { /* P, p, s, w, or other unhandled */ +- bb_show_usage(); +- } +- } +- if (!dumper->fshead) { +- bb_dump_add(dumper, "\"%07.7_Ao\n\""); +- bb_dump_add(dumper, "\"%07.7_ao \" 8/2 \"%06o \" \"\\n\""); +- } +- +- argc -= optind; +- argv += optind; +- +- odoffset(dumper, argc, &argv); +- +- return bb_dump_dump(dumper, argv); +-} +-#endif /* ENABLE_DESKTOP */ +- +-/*- +- * Copyright (c) 1990 The Regents of the University of California. +- * All rights reserved. +- * +- * Redistribution and use in source and binary forms, with or without +- * modification, are permitted provided that the following conditions +- * are met: +- * 1. Redistributions of source code must retain the above copyright +- * notice, this list of conditions and the following disclaimer. +- * 2. Redistributions in binary form must reproduce the above copyright +- * notice, this list of conditions and the following disclaimer in the +- * documentation and/or other materials provided with the distribution. +- * 3. Neither the name of the University nor the names of its contributors +- * may be used to endorse or promote products derived from this software +- * without specific prior written permission. +- * +- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +- * SUCH DAMAGE. +- */ diff --git a/package/expat/Makefile b/package/expat/Makefile index 6d267e53e..28fde3a50 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -12,6 +12,10 @@ PKG_SECTION:= libs PKG_URL:= http://expat.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=expat/} +PKG_SUBPKGS:= LIBEXPAT LIBEXPAT_DEV +PKGSD_LIBEXPAT_DEV:= development files for expat +PKGSC_LIBEXPAT_DEV:= devel + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif @@ -19,9 +23,18 @@ endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBEXPAT_DEV,libexpat-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBEXPAT_DEV},${PKGSC_LIBEXPAT_DEV})) + +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_LIBEXPAT_DEV}+= libexpat-dev-install -post-install: +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib ${CP} ${WRKINST}/usr/lib/libexpat.so* ${IDIR_LIBEXPAT}/usr/lib/ +libexpat-dev-install: + ${INSTALL_DIR} ${IDIR_LIBEXPAT_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBEXPAT_DEV}/usr/include + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 4ef29852e..c21d11671 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME= gettext -PKG_VERSION= 0.16.1 +PKG_VERSION= 0.18.1.1 PKG_RELEASE= 1 -PKG_MD5SUM= 3d9ad24301c6d6b17ec30704a13fe127 +PKG_MD5SUM:= 3dd55b952826d2b32f51308f2f91aa89 PKG_DESCR:= internationalisation library PKG_SECTION:= libs PKG_DEPENDS:= libiconv libpthread @@ -39,7 +39,9 @@ CONFIGURE_ENV+= nls_cv_use_gnu_gettext=yes \ gt_use_preinstalled_gnugettext=no post-install: - ${INSTALL_DIR} ${IDIR_GETTEXT}/usr/lib + ${INSTALL_DIR} ${IDIR_GETTEXT}/usr/lib ${IDIR_GETTEXT}/usr/bin ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_GETTEXT}/usr/lib + $(INSTALL_BIN) $(WRKINST)/usr/bin/gettext \ + $(IDIR_GETTEXT)/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/iw/Makefile b/package/iw/Makefile index 69b8a2852..b69c4dc85 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -21,6 +21,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IW,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual +TCFLAGS+= $(TCPPFLAGS) post-install: ${INSTALL_DIR} ${IDIR_IW}/usr/sbin diff --git a/package/libnl/Makefile b/package/libnl/Makefile index 1cbe9f093..d7021a844 100644 --- a/package/libnl/Makefile +++ b/package/libnl/Makefile @@ -11,12 +11,25 @@ PKG_DESCR:= Netlink library PKG_SECTION:= libs PKG_SITES:= http://downloads.openwrt.org/sources/ |