diff options
60 files changed, 751 insertions, 441 deletions
@@ -191,7 +191,7 @@ NO_ERROR=0 echo "GMAKE:=$$(which gmake)" >>prereq.mk ;\ fi @echo "GNU_HOST_NAME:=$$(${CC} -dumpmachine)" >>prereq.mk - @echo "HOSTARCH:=$$(${CC} -dumpmachine | sed -e s'/-.*//' \ + @echo "ARCH_FOR_BUILD:=$$(${CC} -dumpmachine | sed -e s'/-.*//' \ -e 's/sparc.*/sparc/' \ -e 's/armeb.*/armeb/g' \ -e 's/arm.*/arm/g' \ @@ -205,8 +205,6 @@ NO_ERROR=0 )" >>prereq.mk @echo 'CC_FOR_BUILD:=${CC}' >>prereq.mk @echo 'CXX_FOR_BUILD:=${CXX}' >>prereq.mk - @echo 'HOSTCC:=${CC}' >>prereq.mk - @echo 'HOSTCXX:=${CXX}' >>prereq.mk @echo 'LANGUAGE:=C' >>prereq.mk @echo 'LC_ALL:=C' >>prereq.mk @echo 'MAKE:=$${GMAKE}' >>prereq.mk @@ -1,4 +1,3 @@ -- Xorg update - add and test brcm 2.6 wireless support - man pages in ipkg/tgz packages (automatic) - automate /etc handling via conffiles diff --git a/mk/build.mk b/mk/build.mk index f25508a15..3e1b6cd69 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -302,21 +302,21 @@ endif ifeq ($(ADKtype),ibm-x40) @echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig @echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/.defconfig - @sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/$(HOSTARCH)/sys-available/$(ADKtype) > \ - target/$(HOSTARCH)/sys-enabled/.$(ADKtype) + @sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \ + target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype) @echo "choice" > $(TOPDIR)/target/config/Config.in.native @echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native - @echo "source \"target/$(HOSTARCH)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native + @echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native @echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native endif ifeq ($(ADKtype),lemote-yeelong) @echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig @echo ADK_TARGET_SYSTEM_LEMOTE_YEELONG=y >> $(TOPDIR)/.defconfig - @sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/$(HOSTARCH)/sys-available/$(ADKtype) > \ - target/$(HOSTARCH)/sys-enabled/.$(ADKtype) + @sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \ + target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype) @echo "choice" > $(TOPDIR)/target/config/Config.in.native @echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native - @echo "source \"target/$(HOSTARCH)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native + @echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native @echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native endif @echo 'source "target/config/Config.in.arch.default"' > target/config/Config.in.arch @@ -385,20 +385,20 @@ ifneq (,$(filter CYGWIN%,${OStype})) endif ifeq ($(ADKtype),ibmx-40) @echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/all.config - @sed -e "s#TARGET#NATIVE#" target/$(HOSTARCH)/sys-available/$(ADKtype) > \ - target/$(HOSTARCH)/sys-enabled/.$(ADKtype) + @sed -e "s#TARGET#NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \ + target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype) @echo "choice" > $(TOPDIR)/target/config/Config.in.native @echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native - @echo "source \"target/$(HOSTARCH)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native + @echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native @echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native endif ifeq ($(ADKtype),lemote-yeelong) @echo ADK_TARGET_SYSTEM_LEMOTE_YEELONG=y >> $(TOPDIR)/all.config - @sed -e "s#TARGET#NATIVE#" target/$(HOSTARCH)/sys-available/$(ADKtype) > \ - target/$(HOSTARCH)/sys-enabled/.$(ADKtype) + @sed -e "s#TARGET#NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \ + target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype) @echo "choice" > $(TOPDIR)/target/config/Config.in.native @echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native - @echo "source \"target/$(HOSTARCH)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native + @echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native @echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native endif @echo 'source "target/config/Config.in.arch.default"' > target/config/Config.in.arch @@ -551,20 +551,20 @@ bulkallmod: done <${TOPDIR}/target/arch.lst ;\ done -${TOPDIR}/bin/tools/pkgmaker: tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c +${TOPDIR}/bin/tools/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c @mkdir -p $(TOPDIR)/bin/tools - @$(HOSTCC) -Wall -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c + @$(CC_FOR_BUILD) -Wall -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c -${TOPDIR}/bin/tools/pkgrebuild: - @$(HOSTCC) -Wall -g -o $@ tools/adk/pkgrebuild.c tools/adk/strmap.c +${TOPDIR}/bin/tools/pkgrebuild: $(TOPDIR)/tools/adk/pkgrebuild.c $(TOPDIR)/tools/adk/strmap.c + @$(CC_FOR_BUILD) -Wall -g -o $@ tools/adk/pkgrebuild.c tools/adk/strmap.c package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TOPDIR}/bin/tools/pkgmaker ${TOPDIR}/bin/tools/pkgrebuild @echo "Generating menu structure ..." @$(TOPDIR)/bin/tools/pkgmaker @:>.menu -${TOPDIR}/bin/tools/depmaker: - $(HOSTCC) -g -o $(TOPDIR)/bin/tools/depmaker $(TOPDIR)/tools/adk/depmaker.c +${TOPDIR}/bin/tools/depmaker: $(TOPDIR)/tools/adk/depmaker.c + $(CC_FOR_BUILD) -g -o $(TOPDIR)/bin/tools/depmaker $(TOPDIR)/tools/adk/depmaker.c dep: $(TOPDIR)/bin/tools/depmaker @echo "Generating dependencies ..." diff --git a/mk/vars.mk b/mk/vars.mk index b55b92276..39c35e52a 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -57,6 +57,12 @@ TARGET_LDFLAGS:= -Wl,-O2 -Wl,-rpath -Wl,/usr/lib \ -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \ -L${STAGING_TARGET_DIR}/lib -L${STAGING_TARGET_DIR}/usr/lib +ifneq ($(ADK_NATIVE),) +TARGET_CPPFLAGS:= +TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts +TARGET_LDFLAGS:= +endif + ifneq ($(ADK_STATIC),) TARGET_CFLAGS+= -static TARGET_CXXFLAGS+= -static @@ -81,18 +87,20 @@ else TARGET_CFLAGS+= -fomit-frame-pointer $(TARGET_OPTIMIZATION) endif -ifneq ($(ADK_NATIVE),) -TARGET_CPPFLAGS:= -TARGET_CFLAGS:= $(TARGET_OPTIMIZATION) $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts -TARGET_LDFLAGS:= -endif + +# A nifty macro to make testing gcc features easier (from uClibc project) +check_gcc=$(shell \ + if $(CC_FOR_BUILD) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ + then echo "$(1)"; else echo "$(2)"; fi) + +CF_FOR_BUILD=$(call check_gcc,-fhonour-copts,) # host compiler flags CPPFLAGS_FOR_BUILD?= -CFLAGS_FOR_BUILD?= -O2 -Wall +CFLAGS_FOR_BUILD= -O2 -Wall $(CF_FOR_BUILD) CXXFLAGS_FOR_BUILD?= -O2 -Wall LDFLAGS_FOR_BUILD?= -FLAGS_FOR_BUILD:= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} +FLAGS_FOR_BUILD= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} PATCH= ${BASH} $(SCRIPT_DIR)/patch.sh SED:= sed -i -e diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 6e752a8da..74b9cb474 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -42,7 +42,7 @@ CONFIGURE_ARGS+= --disable-static \ --with-dri-drivers=${DRI_DRIVERS},swrast \ --with-demos=xdemos -XAKE_FLAGS+= HOST_CC=${HOSTCC} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile +XAKE_FLAGS+= HOST_CC=${CC_FOR_BUILD} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile post-extract: (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ diff --git a/package/base-files/Makefile b/package/base-files/Makefile index dee9fd9a4..3744ceb53 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 43 +PKG_RELEASE:= 44 PKG_SECTION:= base PKG_DESCR:= basic files and scripts diff --git a/package/base-files/src/etc/profile b/package/base-files/src/etc/profile index ff808b707..c326f87c2 100644 --- a/package/base-files/src/etc/profile +++ b/package/base-files/src/etc/profile @@ -1,5 +1,6 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin export TERM=linux +export EDITOR=/bin/vi if [[ $(id -u) = 0 ]]; then export PS1='`whoami`@`hostname`:`pwd` # ' else diff --git a/package/busybox/Makefile b/package/busybox/Makefile index bcd582179..9d85302d0 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox PKG_VERSION:= 1.18.1 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= f15fe752d8b7012aa5e59f83b88ccb1c PKG_DESCR:= Core utilities for embedded systems PKG_SECTION:= base @@ -35,30 +35,34 @@ ifeq ($(ADK_NATIVE),y) yes '' | \ $(MAKE) V=1 \ IPKG_ARCH="$(CPU_ARCH)" \ - ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE) + ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE) else yes '' | \ $(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(CPU_ARCH)" \ - ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE) + ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE) endif do-build: ifeq ($(ADK_NATIVE),y) $(MAKE) V=1 \ - IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox + IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \ + -C $(WRKBUILD) busybox else $(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ - IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox + IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \ + -C $(WRKBUILD) busybox endif do-install: ifeq ($(ADK_NATIVE),y) $(MAKE) V=1 \ - IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE) + IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \ + -C $(WRKBUILD) install $(MAKE_TRACE) else $(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ - IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE) + IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \ + -C $(WRKBUILD) install $(MAKE_TRACE) endif $(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/ ifeq ($(ADK_DEBUG),y) diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in index 5462ee98a..8e78e2e27 100644 --- a/package/busybox/config/util-linux/Config.in +++ b/package/busybox/config/util-linux/Config.in @@ -358,7 +358,7 @@ config BUSYBOX_LOSETUP config BUSYBOX_LSPCI bool "lspci" - default y + default n depends on !ADK_PACKAGE_PCIUTILS help lspci is a utility for displaying information about PCI buses in the @@ -368,7 +368,7 @@ config BUSYBOX_LSPCI config BUSYBOX_LSUSB bool "lsusb" - default y + default n depends on !ADK_PACKAGE_LSUSB help lsusb is a utility for displaying information about USB buses in the diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch index 8269c0718..9b5f9a739 100644 --- a/package/busybox/patches/001-ipkg.patch +++ b/package/busybox/patches/001-ipkg.patch @@ -1,6 +1,5 @@ -diff -Nur busybox-1.18.1.orig/Makefile busybox-1.18.1/Makefile ---- busybox-1.18.1.orig/Makefile 2010-12-21 05:31:43.000000000 +0100 -+++ busybox-1.18.1/Makefile 2010-12-25 22:38:55.000000000 +0100 +--- busybox-1.18.1.orig/Makefile ++++ busybox-1.18.1/Makefile @@ -465,6 +465,7 @@ libs-y := \ archival/ \ @@ -9,9 +8,8 @@ diff -Nur busybox-1.18.1.orig/Makefile busybox-1.18.1/Makefile console-tools/ \ coreutils/ \ coreutils/libcoreutils/ \ -diff -Nur busybox-1.18.1.orig/archival/Config.src busybox-1.18.1/archival/Config.src ---- busybox-1.18.1.orig/archival/Config.src 2010-12-20 01:41:26.000000000 +0100 -+++ busybox-1.18.1/archival/Config.src 2010-12-25 22:38:07.000000000 +0100 +--- busybox-1.18.1.orig/archival/Config.src ++++ busybox-1.18.1/archival/Config.src @@ -202,6 +202,12 @@ are actually slower than gzip at equivalent compression ratios and take up 3.2K of code. @@ -25,9 +23,8 @@ diff -Nur busybox-1.18.1.orig/archival/Config.src busybox-1.18.1/archival/Config config RPM2CPIO bool "rpm2cpio" default y -diff -Nur busybox-1.18.1.orig/archival/Kbuild.src busybox-1.18.1/archival/Kbuild.src ---- busybox-1.18.1.orig/archival/Kbuild.src 2010-12-20 01:41:26.000000000 +0100 -+++ busybox-1.18.1/archival/Kbuild.src 2010-12-25 22:38:07.000000000 +0100 +--- busybox-1.18.1.orig/archival/Kbuild.src ++++ busybox-1.18.1/archival/Kbuild.src @@ -22,6 +22,7 @@ lib-$(CONFIG_LZOP) += lzop.o bbunzip.o lib-$(CONFIG_GZIP) += gzip.o bbunzip.o @@ -36,9 +33,8 @@ diff -Nur busybox-1.18.1.orig/archival/Kbuild.src busybox-1.18.1/archival/Kbuild lib-$(CONFIG_UNXZ) += bbunzip.o lib-$(CONFIG_UNLZMA) += bbunzip.o -diff -Nur busybox-1.18.1.orig/archival/ipkg.c busybox-1.18.1/archival/ipkg.c ---- busybox-1.18.1.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.18.1/archival/ipkg.c 2010-12-25 22:38:07.000000000 +0100 +--- /dev/null ++++ busybox-1.18.1/archival/ipkg.c @@ -0,0 +1,28 @@ +/* ipkg.c - the itsy package management system + @@ -68,9 +64,8 @@ diff -Nur busybox-1.18.1.orig/archival/ipkg.c busybox-1.18.1/archival/ipkg.c +{ + return ipkg_op(argc, argv); +} -diff -Nur busybox-1.18.1.orig/archival/libipkg/Kbuild busybox-1.18.1/archival/libipkg/Kbuild ---- busybox-1.18.1.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.18.1/archival/libipkg/Kbuild 2010-12-25 22:38:07.000000000 +0100 +--- /dev/null ++++ busybox-1.18.1/archival/libipkg/Kbuild @@ -0,0 +1,60 @@ +# Makefile for busybox +# @@ -132,9 +127,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/Kbuild busybox-1.18.1/archival/li +IPKG_ARCH:=$(TARGET_ARCH) +endif +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\"" -diff -Nur busybox-1.18.1.orig/archival/libipkg/args.c busybox-1.18.1/archival/libipkg/args.c ---- busybox-1.18.1.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.18.1/archival/libipkg/args.c 2010-12-25 22:38:07.000000000 +0100 +--- /dev/null ++++ busybox-1.18.1/archival/libipkg/args.c @@ -0,0 +1,242 @@ +/* args.c - parse command-line args + @@ -378,9 +372,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/args.c busybox-1.18.1/archival/li +{ + bb_error_msg("version %s\n", IPKG_VERSION); +} -diff -Nur busybox-1.18.1.orig/archival/libipkg/args.h busybox-1.18.1/archival/libipkg/args.h ---- busybox-1.18.1.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.18.1/archival/libipkg/args.h 2010-12-25 22:38:07.000000000 +0100 +--- /dev/null ++++ busybox-1.18.1/archival/libipkg/args.h @@ -0,0 +1,72 @@ +/* args.h - parse command-line args + @@ -454,9 +447,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/args.h busybox-1.18.1/archival/li +void args_usage(const char *complaint); + +#endif -diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile.c busybox-1.18.1/archival/libipkg/conffile.c ---- busybox-1.18.1.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.18.1/archival/libipkg/conffile.c 2010-12-25 22:38:07.000000000 +0100 +--- /dev/null ++++ busybox-1.18.1/archival/libipkg/conffile.c @@ -0,0 +1,65 @@ +/* conffile.c - the itsy package management system + @@ -523,9 +515,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile.c busybox-1.18.1/archiva + + return ret; +} -diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile.h busybox-1.18.1/archival/libipkg/conffile.h ---- busybox-1.18.1.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.18.1/archival/libipkg/conffile.h 2010-12-25 22:38:07.000000000 +0100 +--- /dev/null ++++ busybox-1.18.1/archival/libipkg/conffile.h @@ -0,0 +1,30 @@ +/* conffile.h - the itsy package management system + @@ -557,9 +548,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile.h busybox-1.18.1/archiva + +#endif + -diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile_list.c busybox-1.18.1/archival/libipkg/conffile_list.c ---- busybox-1.18.1.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.18.1/archival/libipkg/conffile_list.c 2010-12-25 22:38:07.000000000 +0100 +--- /dev/null ++++ busybox-1.18.1/archival/libipkg/conffile_list.c @@ -0,0 +1,47 @@ +/* conffile_list.c - the itsy package management system + @@ -608,9 +598,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile_list.c busybox-1.18.1/ar + return nv_pair_list_pop(list); +} + -diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile_list.h busybox-1.18.1/archival/libipkg/conffile_list.h ---- busybox-1.18.1.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.18.1/archival/libipkg/conffile_list.h 2010-12-25 22:38:07.000000000 +0100 +--- /dev/null ++++ busybox-1.18.1/archival/libipkg/conffile_list.h @@ -0,0 +1,36 @@ +/* conffile_list.h - the itsy package management system + @@ -648,9 +637,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile_list.h busybox-1.18.1/ar + +#endif + -diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.c busybox-1.18.1/archival/libipkg/file_util.c ---- busybox-1.18.1.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.18.1/archival/libipkg/file_util.c 2010-12-25 22:38:07.000000000 +0100 +--- /dev/null ++++ busybox-1.18.1/archival/libipkg/file_util.c @@ -0,0 +1,186 @@ +/* file_util.c - convenience routines for common stat operations + @@ -797,7 +785,7 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.c busybox-1.18.1/archiv + } context; + uint8_t *hash_value = NULL; + RESERVE_CONFIG_UBUFFER(in_buf, 4096); -+ void FAST_FUNC (*update)(const void*, size_t, void*); ++ void FAST_FUNC (*update)(void*, const void*, size_t); + void FAST_FUNC (*final)(void*, void*); + + src_fd = open_or_warn_stdin(filename); @@ -815,12 +803,12 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.c busybox-1.18.1/archiv + bb_error_msg_and_die("algorithm not supported"); + } + -+ while (0 < (count = safe_read(src_fd, in_buf, 4096))) { -+ update(in_buf, count, &context); ++ while ((count = safe_read(src_fd, in_buf, 4096)) > 0) { ++ update(&context, in_buf, count); + } + + if (count == 0) { -+ final(in_buf, &context); ++ final(&context, in_buf); + hash_value = hash_bin_to_hex(in_buf, hash_len); + } + @@ -838,9 +826,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.c busybox-1.18.1/archiv + return hash_file(file_name, HASH_MD5); +} + -diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.h busybox-1.18.1/archival/libipkg/file_util.h ---- busybox-1.18.1.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.18.1/archival/libipkg/file_util.h 2010-12-25 22:38:07.000000000 +0100 +--- /dev/null ++++ busybox-1.18.1/archival/libipkg/file_util.h @@ -0,0 +1,29 @@ +/* file_util.h - convenience routines for common file operations + @@ -871,9 +858,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.h busybox-1.18.1/archiv +uint8_t *file_md5sum_alloc(const char *file_name); + +#endif -diff -Nur busybox-1.18.1.orig/archival/libipkg/hash_table.c busybox-1.18.1/archival/libipkg/hash_table.c ---- busybox-1.18.1.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.18.1/archival/libipkg/hash_table.c 2010-12-25 22:38:07.000000000 +0100 +--- /dev/null ++++ busybox-1.18.1/archival/libipkg/hash_table.c @@ -0,0 +1,155 @@ +/* hash.c - hash tables for ipkg + @@ -1030,9 +1016,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/hash_table.c busybox-1.18.1/archi + } +} + -diff -Nur busybox-1.18.1.orig/archival/libipkg/hash_table.h busybox-1.18.1/archival/libipkg/hash_table.h ---- busybox-1.18.1.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.18.1/archival/libipkg/hash_table.h 2010-12-25 22:38:07.000000000 +0100 +--- /dev/null ++++ busybox-1.18.1/archival/libipkg/hash_table.h @@ -0,0 +1,44 @@ +/* hash.h - hash tables for ipkg + @@ -1078,9 +1063,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/hash_table.h busybox-1.18.1/archi +void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data); + +#endif /* _HASH_TABLE_H_ */ -diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg.h busybox-1.18.1/archival/libipkg/ipkg.h ---- busybox-1.18.1.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.18.1/archival/libipkg/ipkg.h 2010-12-25 22:38:07.000000000 +0100 +--- /dev/null ++++ busybox-1.18.1/archival/libipkg/ipkg.h @@ -0,0 +1,68 @@ +/* ipkg.h - the itsy package management system + @@ -1150,9 +1134,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg.h busybox-1.18.1/archival/li +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t; + +#endif -diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.18.1/archival/libipkg/ipkg_cmd.c ---- busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.18.1/archival/libipkg/ipkg_cmd.c 2010-12-25 22:47:47.000000000 +0100 +--- /dev/null ++++ busybox-1.18.1/archival/libipkg/ipkg_cmd.c @@ -0,0 +1,1366 @@ +/* ipkg_cmd.c - the itsy package management system + @@ -2520,9 +2503,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.18.1/archiva +} + + -diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.18.1/archival/libipkg/ipkg_cmd.h ---- busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.18.1/archival/libipkg/ipkg_cmd.h 2010-12-25 22:38:07.000000000 +0100 |