From 220a96f9926788ed531717f78e44fdf1e7ab3b34 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 30 Dec 2010 22:45:29 +0100 Subject: rework architecture / embedded systems concept Make configuration of new targets cheap. Just add a new file in target/arch/sys-enabled/foo. See other files for syntax. While doing runtime tests with the new infrastructure I've updated a lot of other stuff: - gcc 4.5.2 - uClibc 0.9.32-rc1 (NPTL) - strongswan, php, miredo, parted, util-linux-ng, e2fsprogs I promise, this is the last big fat commit this year ;) --- package/DirectFB/Makefile | 3 +- package/MesaLib/Makefile | 10 +- package/MesaLib/patches/patch-configs_default | 2 +- package/adkinstall/Makefile | 15 +- package/adkinstall/src/adkinstall | 17 +- package/adkinstall/src/adkinstall.foxg20 | 3 +- package/adkinstall/src/adkinstall.rb4xx | 3 +- package/adkinstall/src/adkinstall.rb532 | 17 +- package/alix-switch/Makefile | 2 - package/apr-util/Makefile | 8 +- package/apr/Makefile | 8 +- package/arpd/Makefile | 10 +- package/arpwatch/Makefile | 4 +- package/asterisk/Makefile | 20 +- package/aufs2-util/src/Makefile | 58 +- package/base-files/Config.in.manual | 2 +- package/base-files/Makefile | 12 +- package/base-files/files/inittab.serial | 2 +- package/base-files/src/etc/ipkg.conf | 2 +- package/bind/Makefile | 4 +- package/bitlbee/Makefile | 4 +- package/bkeymaps/Makefile | 3 +- package/bogofilter/Makefile | 2 +- package/busybox/Makefile | 6 +- package/busybox/config/util-linux/Config.in | 1 + package/busybox/patches/001-ipkg.patch | 498 +- package/busybox/patches/003-defaults-no.patch | 132 - package/busybox/patches/003-defaults.patch | 137 + .../patches/004-wget-accept-long-opts.patch | 23 - package/busybox/patches/005-dot-find.patch | 12 - package/busybox/patches/006-od-bloat.patch | 40 +- package/busybox/patches/007-endianness-check.patch | 71 - package/cfgfs/Makefile | 6 +- package/cfgfs/src/fwcf.sh | 5 +- package/cpufrequtils/Makefile | 2 - package/cryptinit/Makefile | 10 +- package/cryptsetup/Makefile | 2 +- package/curl/Makefile | 2 +- package/cxxtools/Makefile | 4 +- package/cyrus-sasl/Makefile | 2 +- package/dansguardian/Makefile | 2 +- package/davfs2/patches/patch-src_cache_c | 10 + package/davfs2/patches/patch-src_dav_fuse_c | 10 + package/dbus/Makefile | 4 +- package/dillo/Makefile | 2 +- package/dsniff/Makefile | 10 +- package/e2fsprogs/Makefile | 10 +- package/e2fsprogs/patches/patch-debugfs_dump_c | 30 + .../e2fsprogs/patches/patch-debugfs_dump_c.orig | 10 + package/e2fsprogs/patches/patch-debugfs_logdump_c | 10 + .../e2fsprogs/patches/patch-debugfs_set_fields_c | 10 + package/e2fsprogs/patches/patch-e2fsprogs_spec | 11 + .../e2fsprogs/patches/patch-misc_e2initrd_helper_c | 10 + package/eglibc/Makefile | 11 +- package/elinks/Makefile | 2 +- package/evilwm/Makefile | 2 +- package/fetchmail/Makefile | 2 +- package/ffmpeg/Makefile | 35 +- package/firefox/Makefile | 9 +- package/firefox/patches/patch-configure | 28 +- package/fltk/Makefile | 2 +- package/font-misc-misc/Makefile | 2 +- package/font-util/Makefile | 4 +- package/fprobe/Makefile | 4 +- package/freeglut/Makefile | 2 +- package/freeradius-server/Makefile | 16 +- package/gatling/Makefile | 2 +- package/gcc/Makefile | 2 - package/gdb/Makefile | 2 +- package/gdbserver/Makefile | 2 +- package/gdk-pixbuf/Makefile | 27 + package/gettext/Makefile | 4 +- package/git/Makefile | 2 +- package/glib/Makefile | 6 +- package/glib/patches/patch-gio_Makefile_in | 20 - package/glibc/Makefile | 13 +- package/gmediaserver/Makefile | 4 +- package/gnutls/Makefile | 2 +- package/gpsd/Makefile | 2 +- package/grub-bin/Makefile | 5 +- package/grub/Makefile | 2 +- package/gtk+/Makefile | 9 +- package/gtk+/patches/patch-Makefile_in | 11 - package/gtk+/patches/patch-gtk_gtktypefuncs_c | 70 - package/heimdal/Makefile | 14 +- package/icecast/Makefile | 10 +- package/id3lib/Makefile | 2 +- package/ipcad/Makefile | 4 +- package/ipsec-tools/Makefile | 2 +- package/iptraf/Makefile | 4 +- package/iw/Makefile | 2 +- package/jamvm/Makefile | 2 +- package/krb5/Makefile | 2 +- package/libX11/Makefile | 2 +- package/libXcomposite/Makefile | 43 + package/libXt/Makefile | 2 +- package/libgcc/Makefile | 29 + package/libgcrypt/Makefile | 2 +- package/libgd/Makefile | 6 +- package/libnet/Makefile | 18 +- package/libnet/patches/patch-configure | 83 - package/libnids/Makefile | 2 +- package/libpcap/Makefile | 2 +- package/libpcap/patches/patch-Makefile_in | 4 +- package/libpthread/Makefile | 2 +- package/libstdcxx/Makefile | 2 +- package/libthread_db/Makefile | 2 +- package/libvirt/Makefile | 2 +- package/libvorbis/Makefile | 6 +- package/libxslt/Makefile | 6 +- package/lighttpd/Makefile | 4 +- package/lvm/Makefile | 4 +- package/lvm/patches/patch-libdm_Makefile_in | 17 +- package/lvm/patches/patch-make_tmpl_in | 8 +- package/lvm/patches/patch-scripts_Makefile_in | 10 +- package/lvm/patches/patch-tools_Makefile_in | 10 +- package/lynx/Makefile | 10 +- package/mgetty/patches/patch-Makefile | 2 +- package/mini_httpd/Makefile | 4 +- package/miredo/Makefile | 9 +- package/miredo/patches/patch-libteredo_stub_c | 10 + package/monit/Makefile | 2 +- package/mpd/Makefile | 6 +- package/mplayer/Makefile | 41 +- package/mrd6/Makefile | 2 +- package/mt-daapd/Makefile | 6 +- package/mtd/Makefile | 3 +- package/nand/Makefile | 3 +- package/ncurses/Makefile | 2 +- package/nfs-utils/Makefile | 11 +- .../patches/patch-support_include_sockaddr_h | 10 + package/nfs-utils/patches/patch-tools_Makefile_in | 4 +- .../patches/patch-tools_locktest_Makefile_in | 47 + .../patches/patch-tools_rpcgen_Makefile_in | 11 +- .../patches/patch-tools_rpcgen_rpc_cout_c | 10 + .../patches/patch-tools_rpcgen_rpc_main_c | 32 +- package/nmap/Makefile | 8 +- package/nspr/Makefile | 2 +- package/nss/Makefile | 10 +- package/obexftp/Makefile | 4 +- package/opencdk/Makefile | 2 +- package/opensc/Makefile | 3 + package/opensips/Makefile | 4 +- package/openssh/Makefile | 6 +- package/openssl-pkcs11/Makefile | 2 +- package/openssl/Makefile | 9 +- package/oprofile/Makefile | 3 +- package/osiris/Makefile | 2 +- package/owfs/Makefile | 4 +- package/parted/Makefile | 13 +- package/php/Makefile | 40 +- .../php/patches/patch-ext_standard_php_crypt_r_c | 11 + package/pmacct/Makefile | 4 +- package/portmap/Makefile | 2 +- package/postgresql/Makefile | 2 +- package/ppp/Makefile | 2 +- package/pyrex/Makefile | 2 +- package/python/Makefile | 6 +- package/python2/Makefile | 6 +- package/python2/patches/patch-Makefile_pre_in | 28 +- package/python2/patches/patch-Misc_python_pc | 11 + package/python2/patches/patch-Modules_Setup_config | 11 + package/python2/patches/patch-Modules_config_c | 18 + .../python2/patches/patch-Modules_posixmodule_c | 16 + package/python2/patches/patch-pyconfig_h | 521 + package/python2/patches/patch-setup_py | 10 +- package/rarpd/Makefile | 4 +- package/rpcbind/Makefile | 2 +- package/rpm/Makefile | 2 +- package/rrdtool/Makefile | 2 +- package/rrs/Makefile | 4 +- package/ruby/Makefile | 2 +- package/sangam-atm/Makefile | 2 - package/scanlogd/Makefile | 6 +- package/snort/Makefile | 12 +- package/sqlite/Makefile | 4 +- package/squid/Makefile | 2 +- package/ssltunnel/Makefile | 2 +- package/strace/Makefile | 2 - package/strace/patches/patch-Makefile_in | 10 + package/strace/src/linux/crisv10/syscallent.h | 1 + package/strongswan/Makefile | 5 +- package/strongswan/patches/autotool.patch | 13925 ------------------- package/strongswan/patches/patch-src_pluto_adns_c | 20 + .../strongswan/patches/patch-src_pluto_alg_info_c | 11 - .../patches/patch-src_starter_interfaces_c | 20 - .../strongswan/patches/patch-src_starter_netkey_c | 19 - package/subversion/Makefile | 4 +- package/syslog-ng/Makefile | 2 +- package/tcpdump/Makefile | 2 +- package/tinc/Makefile | 4 +- package/tmsnc/Makefile | 6 +- package/tntnet/Makefile | 2 +- package/tor/Makefile | 4 +- package/twm/Makefile | 2 +- package/uclibc++/Config.in.manual | 2 +- package/uclibc/Makefile | 17 +- package/ulogd/Makefile | 6 +- package/util-linux-ng/Makefile | 14 +- package/valgrind/Makefile | 2 +- package/vtun/Makefile | 2 +- package/weechat/Makefile | 2 +- package/wpa_supplicant/Makefile | 2 +- package/x11-headers/Makefile | 2 +- package/xinit/Makefile | 2 +- package/xorg-server/Makefile | 3 +- package/xproto/Makefile | 4 +- package/xterm/Makefile | 2 - package/xvinfo/Makefile | 2 +- package/zlib/Makefile | 4 +- 210 files changed, 1846 insertions(+), 15195 deletions(-) delete mode 100644 package/busybox/patches/003-defaults-no.patch create mode 100644 package/busybox/patches/003-defaults.patch delete mode 100644 package/busybox/patches/004-wget-accept-long-opts.patch delete mode 100644 package/busybox/patches/005-dot-find.patch delete mode 100644 package/busybox/patches/007-endianness-check.patch create mode 100644 package/davfs2/patches/patch-src_cache_c create mode 100644 package/davfs2/patches/patch-src_dav_fuse_c create mode 100644 package/e2fsprogs/patches/patch-debugfs_dump_c create mode 100644 package/e2fsprogs/patches/patch-debugfs_dump_c.orig create mode 100644 package/e2fsprogs/patches/patch-debugfs_logdump_c create mode 100644 package/e2fsprogs/patches/patch-debugfs_set_fields_c create mode 100644 package/e2fsprogs/patches/patch-e2fsprogs_spec create mode 100644 package/e2fsprogs/patches/patch-misc_e2initrd_helper_c create mode 100644 package/gdk-pixbuf/Makefile delete mode 100644 package/glib/patches/patch-gio_Makefile_in delete mode 100644 package/gtk+/patches/patch-Makefile_in delete mode 100644 package/gtk+/patches/patch-gtk_gtktypefuncs_c create mode 100644 package/libXcomposite/Makefile create mode 100644 package/libgcc/Makefile delete mode 100644 package/libnet/patches/patch-configure create mode 100644 package/miredo/patches/patch-libteredo_stub_c create mode 100644 package/nfs-utils/patches/patch-support_include_sockaddr_h create mode 100644 package/nfs-utils/patches/patch-tools_locktest_Makefile_in create mode 100644 package/nfs-utils/patches/patch-tools_rpcgen_rpc_cout_c create mode 100644 package/php/patches/patch-ext_standard_php_crypt_r_c create mode 100644 package/python2/patches/patch-Misc_python_pc create mode 100644 package/python2/patches/patch-Modules_Setup_config create mode 100644 package/python2/patches/patch-Modules_config_c create mode 100644 package/python2/patches/patch-Modules_posixmodule_c create mode 100644 package/python2/patches/patch-pyconfig_h create mode 100644 package/strace/patches/patch-Makefile_in create mode 100644 package/strace/src/linux/crisv10/syscallent.h delete mode 100644 package/strongswan/patches/autotool.patch create mode 100644 package/strongswan/patches/patch-src_pluto_adns_c delete mode 100644 package/strongswan/patches/patch-src_pluto_alg_info_c delete mode 100644 package/strongswan/patches/patch-src_starter_interfaces_c delete mode 100644 package/strongswan/patches/patch-src_starter_netkey_c (limited to 'package') diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index 056fbb350..8c0522ff2 100644 --- a/package/DirectFB/Makefile +++ b/package/DirectFB/Makefile @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --with-inputdrivers=linuxinput,keyboard,ps2mouse \ # which then chooses the wrong default emulation (which is # probably the real problem here). LDEMULATION overrides ld's # wrong choice. -ifeq (${ADK_HARDWARE_LEMOTE_YEELONG},y) +ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) XAKE_FLAGS+= LDEMULATION=elf64ltsmip endif @@ -51,5 +51,4 @@ post-install: ${CP} ${WRKINST}/usr/lib/directfb-1.4-0/interfaces/IDirectFBVideoProvider/*.so \ ${IDIR_DIRECTFB}/usr/lib/directfb-1.4-0/interfaces/IDirectFBVideoProvider/ - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 430142eaa..6e752a8da 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -21,7 +21,7 @@ PKGSC_GLXINFO:= x11/apps PKGSD_GLXGEARS:= Nice little OpenGL demo application PKGSC_GLXGEARS:= x11/apps -PKG_TARGET_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el +PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} @@ -31,7 +31,7 @@ $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D $(eval $(call PKG_template,GLXINFO,glxinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXINFO},${PKGSC_GLXINFO})) $(eval $(call PKG_template,GLXGEARS,glxgears,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXGEARS},${PKGSC_GLXGEARS})) -ifeq (${ADK_HARDWARE_IBM_X40},y) +ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) DRI_DRIVERS:=i915 endif @@ -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_TOOLS}/bin/glslcompile +XAKE_FLAGS+= HOST_CC=${HOSTCC} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile post-extract: (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ @@ -55,7 +55,7 @@ post-extract: ${MAKE} -C ${WRKBUILD}/src/glsl ${MAKE} -C ${WRKBUILD}/src/glsl/apps ${CP} ${WRKBUILD}/src/glsl/apps/compile \ - ${STAGING_TOOLS}/bin/glslcompile + ${STAGING_HOST_DIR}/bin/glslcompile ${MAKE} -C ${WRKBUILD}/src/glsl clean pre-configure: @@ -66,7 +66,7 @@ post-install: $(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri $(CP) $(WRKINST)/usr/lib/libGL*.so* \ $(IDIR_MESALIB)/usr/lib -ifeq (${ADK_HARDWARE_IBM_X40},y) +ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) ${CP} $(WRKINST)/usr/lib/dri/i915_dri.so \ ${IDIR_MESALIB}/usr/lib/dri/ endif diff --git a/package/MesaLib/patches/patch-configs_default b/package/MesaLib/patches/patch-configs_default index e1fb0b669..f954d9831 100644 --- a/package/MesaLib/patches/patch-configs_default +++ b/package/MesaLib/patches/patch-configs_default @@ -5,7 +5,7 @@ # Misc tools and flags SHELL = /bin/sh -MKLIB = $(SHELL) $(TOP)/bin/mklib -+MKLIB = env RANLIB=/Volumes/adk/openadk/cross_x86_glibc/host/bin/i686-openadk-linux-gnu-ranlib AR=/Volumes/adk/openadk/cross_x86_glibc/host/bin/i686-openadk-linux-gnu-ar $(SHELL) $(TOP)/bin/mklib ++MKLIB = env RANLIB=$(RANLIB) AR=$(AR) $(SHELL) $(TOP)/bin/mklib MKLIB_OPTIONS = MKDEP = makedepend MKDEP_OPTIONS = -fdepend diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile index 5a64ae14d..d4202d78a 100644 --- a/package/adkinstall/Makefile +++ b/package/adkinstall/Makefile @@ -5,13 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= adkinstall PKG_VERSION:= 1.0 -PKG_RELEASE:= 5 +PKG_RELEASE:= 7 PKG_DESCR:= openadk installer PKG_SECTION:= base PKG_DEPENDS:= parted sfdisk e2fsprogs -PKG_URL:= http://www.openadk.org/ - -PKG_TARGET_DEPENDS:= alix wrap routerboard foxg20 +PKG_URL:= http://openadk.org/ WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 @@ -29,13 +27,16 @@ pre-configure: do-install: ${INSTALL_DIR} $(IDIR_ADKINSTALL)/sbin -ifeq ($(ADK_LINUX_MIPS_RB532),y) +ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y) ${INSTALL_BIN} ./src/adkinstall.rb532 \ $(IDIR_ADKINSTALL)/sbin/adkinstall -else ifeq ($(ADK_LINUX_ARM_FOXG20),y) +else ifeq ($(ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20),y) ${INSTALL_BIN} ./src/adkinstall.foxg20 \ $(IDIR_ADKINSTALL)/sbin/adkinstall -else ifeq ($(ADK_LINUX_MIPS_RB4XX),y) +else ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB411),y) + ${INSTALL_BIN} ./src/adkinstall.rb4xx \ + $(IDIR_ADKINSTALL)/sbin/adkinstall +else ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB433),y) ${INSTALL_BIN} ./src/adkinstall.rb4xx \ $(IDIR_ADKINSTALL)/sbin/adkinstall else diff --git a/package/adkinstall/src/adkinstall b/package/adkinstall/src/adkinstall index 62ab3225a..b9b0e3109 100644 --- a/package/adkinstall/src/adkinstall +++ b/package/adkinstall/src/adkinstall @@ -52,11 +52,18 @@ if [ $rescue -eq 1 ];then rootp=3 cfgfsp=4 start=2 - parted -s /dev/sda unit cyl mkpartfs primary ext2 0 1 - parted -s /dev/sda unit cyl mkpartfs primary ext2 1 2 + parted -s /dev/sda unit cyl mkpart primary ext2 0 1 + check_exit + mke2fs /dev/sda1 + check_exit + parted -s /dev/sda unit cyl mkpart primary ext2 1 2 + check_exit + mke2fs /dev/sda2 check_exit fi -parted -s /dev/sda unit cyl mkpartfs primary ext2 $start $rootsize +parted -s /dev/sda unit cyl mkpart primary ext2 $start $rootsize +check_exit +mke2fs /dev/sda1 check_exit parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize check_exit @@ -124,7 +131,7 @@ menuentry "GNU/Linux (OpenADK)" { recordfail insmod ext2 set root=(hd0,3) - linux /boot/vmlinuz-adk root=/dev/sda$rootp ro init=/init panic=10 + linux /boot/kernel root=/dev/sda$rootp ro init=/init panic=10 } menuentry "GNU/Linux (OpenADK) Rescue Mode" { @@ -145,7 +152,7 @@ terminal_input serial menuentry "GNU/Linux (OpenADK)" { insmod ext2 set root=(hd0,1) - linux /boot/vmlinuz-adk root=/dev/sda$rootp ro init=/init panic=10 + linux /boot/kernel root=/dev/sda$rootp ro init=/init panic=10 } EOF fi diff --git a/package/adkinstall/src/adkinstall.foxg20 b/package/adkinstall/src/adkinstall.foxg20 index 4b0251309..61ab65d9d 100644 --- a/package/adkinstall/src/adkinstall.foxg20 +++ b/package/adkinstall/src/adkinstall.foxg20 @@ -17,7 +17,7 @@ parted -s /dev/mmcblk0 mklabel msdos sleep 2 maxsize=$(env LC_ALL=C parted /dev/mmcblk0 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//') rootsize=$(($maxsize-2)) -parted -s /dev/mmcblk0 unit cyl mkpartfs primary fat32 0 5 +parted -s /dev/mmcblk0 unit cyl mkpart primary fat32 0 5 parted -s /dev/mmcblk0 unit cyl mkpart primary ext2 5 $rootsize parted -s /dev/mmcblk0 unit cyl mkpart primary fat32 $rootsize $maxsize parted -s /dev/mmcblk0 set 1 boot on @@ -25,6 +25,7 @@ sfdisk --change-id /dev/mmcblk0 3 88 >/dev/null 2>&1 sleep 2 sync printf "Creating ext2 filesystem\n" +mkfs.vfat /dev/mmcblk0p1 >/dev/null 2>&1 mke2fs /dev/mmcblk0p2 >/dev/null 2>&1 tune2fs -c0 -i0 /dev/mmcblk0p2 >/dev/null 2>&1 mount -t ext2 /dev/mmcblk0p2 /mnt diff --git a/package/adkinstall/src/adkinstall.rb4xx b/package/adkinstall/src/adkinstall.rb4xx index f96cc7f05..afaea0c39 100644 --- a/package/adkinstall/src/adkinstall.rb4xx +++ b/package/adkinstall/src/adkinstall.rb4xx @@ -1,6 +1,5 @@ #!/bin/sh -# installs a rootfs tar archive from OpenADK onto -# a NAND device +# installs a rootfs tar archive from OpenADK onto a NAND device # special script for routerboard rb4xx if [ -z $1 ];then diff --git a/package/adkinstall/src/adkinstall.rb532 b/package/adkinstall/src/adkinstall.rb532 index e71848325..9f1af0bb6 100644 --- a/package/adkinstall/src/adkinstall.rb532 +++ b/package/adkinstall/src/adkinstall.rb532 @@ -14,12 +14,6 @@ if [ -z $2 ];then printf "Please give your root tar archive as second parameter\n" exit 1 fi -if [ $cfinstall -eq 1 ];then - if [ -z $3 ];then - printf "Please give your kernel as third parameter\n" - exit 1 - fi -fi case $1 in nand) nandinstall=1 @@ -33,6 +27,13 @@ case $1 in ;; esac +if [ $cfinstall -eq 1 ];then + if [ -z $3 ];then + printf "Please give your kernel as third parameter\n" + exit 1 + fi +fi + if [ $cfinstall -eq 1 ];then # create empty partition table printf "Creating partition scheme\n" @@ -41,12 +42,13 @@ if [ $cfinstall -eq 1 ];then maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//') rootsize=$(($maxsize-2)) parted -s /dev/sda unit cyl mkpart primary ext2 0 1 - parted -s /dev/sda unit cyl mkpartfs primary ext2 1 $rootsize + parted -s /dev/sda unit cyl mkpart primary ext2 1 $rootsize parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize parted -s /dev/sda set 1 boot on sfdisk --change-id /dev/sda 1 27 >/dev/null 2>&1 sfdisk --change-id /dev/sda 3 88 >/dev/null 2>&1 sleep 2 + mke2fs /dev/sda2 sync printf "Installing kernel\n" dd if=$3 of=/dev/sda1 bs=2048 >/dev/null 2>&1 @@ -71,7 +73,6 @@ fi chmod 1777 /mnt/tmp chmod 4755 /mnt/bin/busybox - sync if [ $nandinstall -eq 1 ];then diff --git a/package/alix-switch/Makefile b/package/alix-switch/Makefile index 8fa705bb9..0317fdf7d 100644 --- a/package/alix-switch/Makefile +++ b/package/alix-switch/Makefile @@ -10,8 +10,6 @@ PKG_DESCR:= daemon listening on button events PKG_SECTION:= base PKG_URL:= http://openadk.org/ -PKG_TARGET_DEPENDS:= alix - NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile index 86ddd34ca..2d533ef76 100644 --- a/package/apr-util/Makefile +++ b/package/apr-util/Makefile @@ -19,10 +19,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,APR_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --without-berkeley-db -CONFIGURE_ARGS+= --with-apr=${STAGING_DIR}/usr -CONFIGURE_ARGS+= --with-expat=${STAGING_DIR}/usr -XAKE_FLAGS+= apr_builddir=${STAGING_DIR}/usr/share/build-1 \ - apr_builders=${STAGING_DIR}/usr/share/build-1 +CONFIGURE_ARGS+= --with-apr=${STAGING_TARGET_DIR}/usr +CONFIGURE_ARGS+= --with-expat=${STAGING_TARGET_DIR}/usr +XAKE_FLAGS+= apr_builddir=${STAGING_TARGET_DIR}/usr/share/build-1 \ + apr_builders=${STAGING_TARGET_DIR}/usr/share/build-1 post-install: ${INSTALL_DIR} ${IDIR_APR_UTIL}/usr/lib diff --git a/package/apr/Makefile b/package/apr/Makefile index 08faf55d9..096981833 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -41,12 +41,12 @@ endif post-install: ${INSTALL_DIR} ${IDIR_APR}/usr/lib ${CP} ${WRKINST}/usr/lib/libapr-1.so* ${IDIR_APR}/usr/lib/ - ${INSTALL_DIR} ${STAGING_DIR}/usr/share/build-1 - ${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_DIR}/usr/share/build-1/ + ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/build-1 + ${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_TARGET_DIR}/usr/share/build-1/ # we need to patch paths to get apr-util compiling - $(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," \ + $(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_TARGET_DIR}\2," \ ${WRKINST}/usr/bin/apr-1-config - $(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," \ + $(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_TARGET_DIR}\2," \ ${WRKINST}/usr/bin/apr-1-config include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/arpd/Makefile b/package/arpd/Makefile index 071e4eb7d..3494c2115 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -20,12 +20,12 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --with-libdnet=${STAGING_DIR}/usr \ - --with-libevent=${STAGING_DIR}/usr \ - --with-libpcap=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-libdnet=${STAGING_TARGET_DIR}/usr \ + --with-libevent=${STAGING_TARGET_DIR}/usr \ + --with-libpcap=${STAGING_TARGET_DIR}/usr MAKE_FLAGS+= CCOPT="${TARGET_CFLAGS}" \ - INCLS="-I. -I${STAGING_DIR}/usr/include" \ - LIBS="-L${STAGING_DIR}/usr/lib -lpcap -ldnet -levent" + INCLS="-I. -I${STAGING_TARGET_DIR}/usr/include" \ + LIBS="-L${STAGING_TARGET_DIR}/usr/lib -lpcap -ldnet -levent" post-install: ${INSTALL_DIR} ${IDIR_ARPD}/usr/sbin diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile index a3e437f64..38444971a 100644 --- a/package/arpwatch/Makefile +++ b/package/arpwatch/Makefile @@ -22,8 +22,8 @@ INSTALL_STYLE:= manual MAKE_FLAGS+= ARPDIR=/etc/arpwatch \ CCOPT="$(TARGET_CFLAGS)" \ - INCLS="-I. -I$(STAGING_DIR)/usr/include" \ - LIBS="-L$(STAGING_DIR)/usr/lib -lpcap" + INCLS="-I. -I$(STAGING_TARGET_DIR)/usr/include" \ + LIBS="-L$(STAGING_TARGET_DIR)/usr/lib -lpcap" do-install: $(INSTALL_DIR) $(IDIR_ARPWATCH)/usr/sbin $(IDIR_ARPWATCH)/etc/arpwatch diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 70baefbd9..bdf44fb96 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -16,7 +16,7 @@ PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/ PKG_MULTI:= 1 PKG_NOPARALLEL:= 1 -PKG_TARGET_DEPENDS:= !foxboard +PKG_ARCH_DEPENDS:= !cris PKG_SUBPKGS:= ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS ASTERISK_CHAN_MGCP PKG_SUBPKGS+= ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM @@ -57,9 +57,9 @@ SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CODEC_GSM}+= asterisk-codec-gsm-install SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_PBX_DUNDI}+= asterisk-pbx-dundi-install SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_RES_AGI}+= asterisk-res-agi-install -CONFIGURE_ARGS= --with-z=${STAGING_DIR}/usr \ - --with-ncurses=${STAGING_DIR}/usr \ - --with-ssl=${STAGING_DIR}/usr \ +CONFIGURE_ARGS= --with-z=${STAGING_TARGET_DIR}/usr \ + --with-ncurses=${STAGING_TARGET_DIR}/usr \ + --with-ssl=${STAGING_TARGET_DIR}/usr \ --disable-xmldoc \ --without-tonezone \ --without-asound \ @@ -91,21 +91,21 @@ else CONFIGURE_ARGS+= --without-gsm endif ifneq (${ADK_PACKAGE_ASTERISK_CODEC_SPEEX},) -CONFIGURE_ARGS+= --with-speex=${STAGING_DIR}/usr -EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/speex +CONFIGURE_ARGS+= --with-speex=${STAGING_TARGET_DIR}/usr +EXTRA_CFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/speex endif ifneq (${ADK_PACKAGE_ASTERISK_FORMAT_VORBIS},) -CONFIGURE_ARGS+= --with-ogg=${STAGING_DIR}/usr \ - --with-vorbis=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-ogg=${STAGING_TARGET_DIR}/usr \ + --with-vorbis=${STAGING_TARGET_DIR}/usr TLDFLAGS+= -logg endif ifneq (${ADK_PACKAGE_ASTERISK_CURL},) -CONFIGURE_ARGS+= --with-libcurl=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-libcurl=${STAGING_TARGET_DIR}/usr else CONFIGURE_ARGS+= --without-libcurl endif ifneq (${ADK_PACKAGE_ASTERISK_PGSQL},) -CONFIGURE_ARGS+= --with-postgres=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-postgres=${STAGING_TARGET_DIR}/usr else CONFIGURE_ARGS+= --without-postgres endif diff --git a/package/aufs2-util/src/Makefile b/package/aufs2-util/src/Makefile index 35c5f6645..544dfc538 100644 --- a/package/aufs2-util/src/Makefile +++ b/package/aufs2-util/src/Makefile @@ -1,5 +1,5 @@ -# Copyright (C) 2005-2009 Junjiro Okajima +# Copyright (C) 2005-2010 Junjiro R. Okajima # # This program, aufs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,11 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -ifndef KDIR -KDIR = /lib/modules/$(shell uname -r)/build -endif - -CFLAGS += -I${KDIR}/include +CFLAGS += -I./libau CFLAGS += -O -Wall Cmd = umount.aufs auchk aubrsync @@ -27,32 +23,23 @@ Man = aufs.5 Etc = etc_default_aufs Bin = auplink mount.aufs #auctl BinObj = $(addsuffix .o, ${Bin}) -LibSo = libau.so -LibSoObj = rdu.o -LibSoHdr = compat.h LibUtil = libautil.a LibUtilObj = proc_mnt.o br.o plink.o mtab.o LibUtilHdr = au_util.h +export -all: ${Bin} ${Etc} #${LibSo} +all: ${Man} ${Bin} ${Etc} + ${MAKE} -C libau $@ + ln -sf ./libau/libau*.so . ${Bin}: LDFLAGS += -static -s ${Bin}: LDLIBS = -L. -lautil ${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil} ${LibUtilObj}: %.o: %.c ${LibUtilHdr} -${LibUtil}: ${LibUtil}(${LibUtilObj}) - -${LibSoObj}: CFLAGS += -fPIC -${LibSoObj}: %.o: %.c ${LibSolHdr} - -# in order to reuse the default rule -Dummy = $(basename $(word 1,${LibSoObj})) -${Dummy}: LDFLAGS += --shared -${Dummy}: LDLIBS += -ldl -lpthread -${Dummy}: ${LibSoObj} -${LibSo}: ${Dummy} - ln -f $< $@ +#${LibUtil}: ${LibUtil}(${LibUtilObj}) +${LibUtil}: $(foreach o, ${LibUtilObj}, ${LibUtil}(${o})) +.NOTPARALLEL: ${LibUtil} etc_default_aufs: c2sh aufs.shlib ${RM} $@ @@ -75,29 +62,32 @@ aufs.5: aufs.in.5 c2tmac .INTERMEDIATE: c2sh c2tmac +Install = install -o root -g root -p install_sbin: File = mount.aufs umount.aufs auplink install_sbin: Tgt = ${DESTDIR}/sbin install_ubin: File = auchk aubrsync #auctl install_ubin: Tgt = ${DESTDIR}/usr/bin -install_man: File = aufs.5 -install_man: Tgt = ${DESTDIR}/usr/share/man/man5 -install_ulib: Opt = -s -install_ulib: File = ${LibSo} -install_ulib: Tgt = ${DESTDIR}/ulib -install_sbin install_ubin install_man install_ulib: ${File} +install_sbin install_ubin: ${File} install -d ${Tgt} - install -m 755 -o root -g root -p ${Opt} ${File} ${Tgt} + ${Install} -m 755 ${File} ${Tgt} install_etc: File = etc_default_aufs install_etc: Tgt = ${DESTDIR}/etc/default/aufs install_etc: ${File} install -d $(dir ${Tgt}) - install -m 644 -o root -g root -p -T ${File} ${Tgt} + ${Install} -m 644 -T ${File} ${Tgt} +install_man: File = aufs.5 +install_man: Tgt = ${DESTDIR}/usr/share/man/man5 +install_man: ${File} + install -d ${Tgt} + ${Install} -m 644 ${File} ${Tgt} +install_ulib: + ${MAKE} -C libau $@ -# do not inlcude install_ulib here -install: install_sbin install_ubin install_etc +install: install_man install_sbin install_ubin install_etc install_ulib clean: - ${RM} ${Man} ${Bin} ${Etc} ${LibUtil} ${LibSo} *~ - ${RM} ${BinObj} ${LibUtilObj} ${LibSoObj} ${Dummy} + ${RM} ${Man} ${Bin} ${Etc} ${LibUtil} libau.so* *~ + ${RM} ${BinObj} ${LibUtilObj} + ${MAKE} -C libau $@ -include priv.mk diff --git a/package/base-files/Config.in.manual b/package/base-files/Config.in.manual index a3180f4dc..68d22bbd2 100644 --- a/package/base-files/Config.in.manual +++ b/package/base-files/Config.in.manual @@ -6,9 +6,9 @@ config ADK_COMPILE_BASE_FILES config ADK_PACKAGE_BASE_FILES prompt "base-files............. basic filesystem structure and scripts" tristate - default y if !ADK_TOOLCHAIN_ONLY select ADK_COMPILE_BASE_FILES depends on !ADK_TOOLCHAIN_ONLY + default y if !ADK_TOOLCHAIN_ONLY help basic filesystem structure and scripts diff --git a/package/base-files/Makefile b/package/base-files/Makefile index f0695966e..7091c8541 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -24,13 +24,14 @@ INSTALL_STYLE:= manual do-install: $(CP) ./src/* $(IDIR_BASE_FILES) # allow this to fail, as there might be no target-specific files to copy - -$(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES) + -$(CP) $(TOPDIR)/target/$(ADK_TARGET_ARCH)/files/* $(IDIR_BASE_FILES) ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y) @echo "#" > $(IDIR_BASE_FILES)/etc/network/interfaces endif - $(SED) 's,@TARGET@,$(ADK_TARGET),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + $(SED) 's,@ARCH@,$(ADK_TARGET_ARCH),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + $(SED) 's,@SYSTEM@,$(ADK_TARGET_SYSTEM),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + $(SED) 's,@LIBC@,$(ADK_TARGET_LIBC),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@HOST@,$(ADK_HOST),g' $(IDIR_BASE_FILES)/etc/ipkg.conf - $(SED) 's,@LIBC@,$(ADK_LIBC),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@VENDOR@,$(ADK_VENDOR),g' $(IDIR_BASE_FILES)/etc/ipkg.conf echo /bin/sh >${IDIR_BASE_FILES}/etc/shells echo /bin/ash >>${IDIR_BASE_FILES}/etc/shells @@ -61,6 +62,7 @@ endif cat ./files/inittab.serial >> $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_CONSOLE_BOTH) || \ cat ./files/inittab.vga >> $(IDIR_BASE_FILES)/etc/inittab + $(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_HOSTNAME) || \ echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \ echo "127.0.0.1 $(ADK_RUNTIME_HOSTNAME)" >> $(IDIR_BASE_FILES)/etc/hosts @@ -69,8 +71,8 @@ endif ${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow git log -1|head -1|sed -e 's#commit ##' \ > $(IDIR_BASE_FILES)/etc/adkversion - test -z $(ADK_HW) || \ - echo $(ADK_HW) > $(IDIR_BASE_FILES)/etc/adktarget + test -z $(ADK_TARGET_SYSTEM) || \ + echo $(ADK_TARGET_SYSTEM) > $(IDIR_BASE_FILES)/etc/adktarget ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},) gzip -9c ${TOPDIR}/.config >$(IDIR_BASE_FILES)/etc/adkconfig.gz chmod 600 $(IDIR_BASE_FILES)/etc/adkconfig.gz diff --git a/package/base-files/files/inittab.serial b/package/base-files/files/inittab.serial index b50bddb0c..5de880f2a 100644 --- a/package/base-files/files/inittab.serial +++ b/package/base-files/files/inittab.serial @@ -1 +1 @@ -ttyS0::respawn:/sbin/getty -i -L ttyS0 115200 vt100 +ttyS0::respawn:/sbin/getty -i -L ttyS0 @SPEED@ vt100 diff --git a/package/base-files/src/etc/ipkg.conf b/package/base-files/src/etc/ipkg.conf index edb050116..cef6d2845 100644 --- a/package/base-files/src/etc/ipkg.conf +++ b/package/base-files/src/etc/ipkg.conf @@ -1,3 +1,3 @@ -src @VENDOR@ http://@HOST@/@TARGET@_@LIBC@/packages +src @VENDOR@ http://@HOST@/@SYSTEM@_@ARCH@_@LIBC@/packages dest root / dest ram /tmp diff --git a/package/bind/Makefile b/package/bind/Makefile index 9adff33fd..fdde3bf10 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -40,8 +40,8 @@ $(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKG CONFIGURE_ARGS+= --with-randomdev=/dev/urandom \ --disable-threads \ - --with-openssl=${STAGING_DIR}/usr/ \ - --with-libxml2=${STAGING_DIR}/usr/ \ + --with-openssl=${STAGING_TARGET_DIR}/usr/ \ + --with-libxml2=${STAGING_TARGET_DIR}/usr/ \ --enable-epoll \ --with-libtool diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index 41319a738..9c18f0c13 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -37,9 +37,9 @@ CONFIGURE_ARGS:= --target=${REAL_GNU_TARGET_NAME} \ INSTALL_TARGET= install-etc install-bin post-configure: - @echo 'CFLAGS+="-I${STAGING_DIR}/usr/include/iconv"' >> \ + @echo 'CFLAGS+="-I${STAGING_TARGET_DIR}/usr/include/iconv"' >> \ ${WRKBUILD}/Makefile.settings - @echo 'LFLAGS+="-L${STAGING_DIR}/usr/lib"' >> \ + @echo 'LFLAGS+="-L${STAGING_TARGET_DIR}/usr/lib"' >> \ ${WRKBUILD}/Makefile.settings post-install: diff --git a/package/bkeymaps/Makefile b/package/bkeymaps/Makefile index 74f37f91d..0a6bf90d8 100644 --- a/package/bkeymaps/Makefile +++ b/package/bkeymaps/Makefile @@ -9,8 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= a68058ab4a81cf9a8dcbaaa7a5df5b11 PKG_DESCR:= binary keymaps for busybox loadkmap PKG_SECTION:= utils -PKG_URL:= http://dev.alpinelinux.org/bkeymaps/ -PKG_SITES:= http://dev.alpinelinux.org/bkeymaps/ +PKG_SITES:= http://openadk.org/distfiles/ PKG_DFLT_BKEYMAPS:= y if ADK_TARGET_WITH_INPUT diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile index c56aceddc..4f83f73f4 100644 --- a/package/bogofilter/Makefile +++ b/package/bogofilter/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV+= LIBS="-liconv" \ CONFIGURE_ARGS+= --without-libsqlite3-prefix \ --without-libqdbm-prefix \ --with-included-gsl \ - --with-libdb-prefix=${STAGING_DIR}/usr \ + --with-libdb-prefix=${STAGING_TARGET_DIR}/usr \ --disable-transactions post-install: diff --git a/package/busybox/Makefile b/package/busybox/Makefile index d4b9e8c6a..46752cb72 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox -PKG_VERSION:= 1.17.2 -PKG_RELEASE:= 5 -PKG_MD5SUM:= 7360b7138b899ee7fc885791c740c3c3 +PKG_VERSION:= 1.18.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= f15fe752d8b7012aa5e59f83b88ccb1c PKG_DESCR:= Core utilities for embedded systems PKG_SECTION:= base PKG_URL:= http://www.busybox.net/ diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in index 6fe8f7d33..5462ee98a 100644 --- a/package/busybox/config/util-linux/Config.in +++ b/package/busybox/config/util-linux/Config.in @@ -253,6 +253,7 @@ config BUSYBOX_MKFS_REISER config BUSYBOX_MKFS_VFAT bool "mkfs_vfat" + default y if ADK_TARGET_WITH_MMC default n help Utility to create FAT32 filesystems. diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch index 10519636b..8269c0718 100644 --- a/package/busybox/patches/001-ipkg.patch +++ b/package/busybox/patches/001-ipkg.patch @@ -1,17 +1,17 @@ -diff -Nur busybox-1.17.2.orig/Makefile busybox-1.17.2/Makefile ---- busybox-1.17.2.orig/Makefile 2010-08-23 02:51:08.000000000 +0200 -+++ busybox-1.17.2/Makefile 2010-12-01 22:25:23.000000000 +0100 -@@ -464,6 +464,7 @@ - +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 +@@ -465,6 +465,7 @@ libs-y := \ archival/ \ + archival/libarchive/ \ + archival/libipkg/ \ - archival/libunarchive/ \ console-tools/ \ coreutils/ \ -diff -Nur busybox-1.17.2.orig/archival/Config.src busybox-1.17.2/archival/Config.src ---- busybox-1.17.2.orig/archival/Config.src 2010-08-22 10:21:38.000000000 +0200 -+++ busybox-1.17.2/archival/Config.src 2010-12-01 22:25:23.000000000 +0100 + 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 @@ -202,6 +202,12 @@ are actually slower than gzip at equivalent compression ratios and take up 3.2K of code. @@ -25,20 +25,20 @@ diff -Nur busybox-1.17.2.orig/archival/Config.src busybox-1.17.2/archival/Config config RPM2CPIO bool "rpm2cpio" default y -diff -Nur busybox-1.17.2.orig/archival/Kbuild.src busybox-1.17.2/archival/Kbuild.src ---- busybox-1.17.2.orig/archival/Kbuild.src 2010-08-23 02:44:35.000000000 +0200 -+++ busybox-1.17.2/archival/Kbuild.src 2010-12-01 22:25:23.000000000 +0100 -@@ -23,6 +23,7 @@ - lib-$(CONFIG_LZOP_COMPR_HIGH) += lzo1x_9x.o +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 +@@ -22,6 +22,7 @@ + lib-$(CONFIG_LZOP) += lzop.o bbunzip.o lib-$(CONFIG_GZIP) += gzip.o bbunzip.o lib-$(CONFIG_BZIP2) += bzip2.o bbunzip.o +lib-$(CONFIG_IPKG) += ipkg.o lib-$(CONFIG_UNXZ) += bbunzip.o lib-$(CONFIG_UNLZMA) += bbunzip.o -diff -Nur busybox-1.17.2.orig/archival/ipkg.c busybox-1.17.2/archival/ipkg.c ---- busybox-1.17.2.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/ipkg.c 2010-12-01 22:25:23.000000000 +0100 +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 @@ -0,0 +1,28 @@ +/* ipkg.c - the itsy package management system + @@ -68,9 +68,9 @@ diff -Nur busybox-1.17.2.orig/archival/ipkg.c busybox-1.17.2/archival/ipkg.c +{ + return ipkg_op(argc, argv); +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/Kbuild busybox-1.17.2/archival/libipkg/Kbuild ---- busybox-1.17.2.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/Kbuild 2010-12-01 22:25:23.000000000 +0100 +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 @@ -0,0 +1,60 @@ +# Makefile for busybox +# @@ -132,9 +132,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/Kbuild busybox-1.17.2/archival/li +IPKG_ARCH:=$(TARGET_ARCH) +endif +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\"" -diff -Nur busybox-1.17.2.orig/archival/libipkg/args.c busybox-1.17.2/archival/libipkg/args.c ---- busybox-1.17.2.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/args.c 2010-12-01 22:25:23.000000000 +0100 +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 @@ -0,0 +1,242 @@ +/* args.c - parse command-line args + @@ -378,9 +378,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/args.c busybox-1.17.2/archival/li +{ + bb_error_msg("version %s\n", IPKG_VERSION); +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/args.h busybox-1.17.2/archival/libipkg/args.h ---- busybox-1.17.2.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/args.h 2010-12-01 22:25:23.000000000 +0100 +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 @@ -0,0 +1,72 @@ +/* args.h - parse command-line args + @@ -454,9 +454,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/args.h busybox-1.17.2/archival/li +void args_usage(const char *complaint); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.c busybox-1.17.2/archival/libipkg/conffile.c ---- busybox-1.17.2.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/conffile.c 2010-12-01 22:25:23.000000000 +0100 +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 @@ -0,0 +1,65 @@ +/* conffile.c - the itsy package management system + @@ -523,9 +523,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.c busybox-1.17.2/archiva + + return ret; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.h busybox-1.17.2/archival/libipkg/conffile.h ---- busybox-1.17.2.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/conffile.h 2010-12-01 22:25:23.000000000 +0100 +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 @@ -0,0 +1,30 @@ +/* conffile.h - the itsy package management system + @@ -557,9 +557,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.h busybox-1.17.2/archiva + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.c busybox-1.17.2/archival/libipkg/conffile_list.c ---- busybox-1.17.2.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/conffile_list.c 2010-12-01 22:25:23.000000000 +0100 +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 @@ -0,0 +1,47 @@ +/* conffile_list.c - the itsy package management system + @@ -608,9 +608,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.c busybox-1.17.2/ar + return nv_pair_list_pop(list); +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.h busybox-1.17.2/archival/libipkg/conffile_list.h ---- busybox-1.17.2.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/conffile_list.h 2010-12-01 22:25:23.000000000 +0100 +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 @@ -0,0 +1,36 @@ +/* conffile_list.h - the itsy package management system + @@ -648,9 +648,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.h busybox-1.17.2/ar + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.c busybox-1.17.2/archival/libipkg/file_util.c ---- busybox-1.17.2.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/file_util.c 2010-12-01 22:25:23.000000000 +0100 +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 @@ -0,0 +1,186 @@ +/* file_util.c - convenience routines for common stat operations + @@ -838,9 +838,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.c busybox-1.17.2/archiv + return hash_file(file_name, HASH_MD5); +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.h busybox-1.17.2/archival/libipkg/file_util.h ---- busybox-1.17.2.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/file_util.h 2010-12-01 22:25:23.000000000 +0100 +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 @@ -0,0 +1,29 @@ +/* file_util.h - convenience routines for common file operations + @@ -871,9 +871,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.h busybox-1.17.2/archiv +uint8_t *file_md5sum_alloc(const char *file_name); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.c busybox-1.17.2/archival/libipkg/hash_table.c ---- busybox-1.17.2.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/hash_table.c 2010-12-01 22:25:23.000000000 +0100 +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 @@ -0,0 +1,155 @@ +/* hash.c - hash tables for ipkg + @@ -1030,9 +1030,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.c busybox-1.17.2/archi + } +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.h busybox-1.17.2/archival/libipkg/hash_table.h ---- busybox-1.17.2.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/hash_table.h 2010-12-01 22:25:23.000000000 +0100 +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 @@ -0,0 +1,44 @@ +/* hash.h - hash tables for ipkg + @@ -1078,9 +1078,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.h busybox-1.17.2/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.17.2.orig/archival/libipkg/ipkg.h busybox-1.17.2/archival/libipkg/ipkg.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg.h 2010-12-01 22:25:23.000000000 +0100 +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 @@ -0,0 +1,68 @@ +/* ipkg.h - the itsy package management system + @@ -1150,9 +1150,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg.h busybox-1.17.2/archival/li +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t; + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.2/archival/libipkg/ipkg_cmd.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_cmd.c 2010-12-01 22:25:23.000000000 +0100 +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 @@ -0,0 +1,1366 @@ +/* ipkg_cmd.c - the itsy package management system + @@ -1193,7 +1193,7 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.2/archiva +#include "pkg.h" +#include "file_util.h" +#include "str_util.h" -+#include "unarchive.h" ++#include "archive.h" + +#include + @@ -2520,9 +2520,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.2/archiva +} + + -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.2/archival/libipkg/ipkg_cmd.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_cmd.h 2010-12-01 22:25:23.000000000 +0100 +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 @@ -0,0 +1,41 @@ +/* ipkg_cmd.h - the itsy package management system + @@ -2565,9 +2565,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.2/archiva +int pkg_mark_provides(pkg_t *pkg); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.c busybox-1.17.2/archival/libipkg/ipkg_conf.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_conf.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_conf.c busybox-1.18.1/archival/libipkg/ipkg_conf.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_conf.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,711 @@ +/* ipkg_conf.c - the itsy package management system + @@ -3280,9 +3280,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.c busybox-1.17.2/archiv + sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename); + return root_filename; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.h busybox-1.17.2/archival/libipkg/ipkg_conf.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_conf.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_conf.h busybox-1.18.1/archival/libipkg/ipkg_conf.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_conf.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,107 @@ +/* ipkg_conf.h - the itsy package management system + @@ -3391,9 +3391,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.h busybox-1.17.2/archiv +char *root_filename_alloc(ipkg_conf_t *conf, char *filename); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.c busybox-1.17.2/archival/libipkg/ipkg_configure.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_configure.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_configure.c busybox-1.18.1/archival/libipkg/ipkg_configure.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_configure.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,40 @@ +/* ipkg_configure.c - the itsy package management system + @@ -3435,9 +3435,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.c busybox-1.17.2/a + return 0; +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.h busybox-1.17.2/archival/libipkg/ipkg_configure.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_configure.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_configure.h busybox-1.18.1/archival/libipkg/ipkg_configure.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_configure.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,25 @@ +/* ipkg_configure.h - the itsy package management system + @@ -3464,9 +3464,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.h busybox-1.17.2/a +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.c busybox-1.17.2/archival/libipkg/ipkg_download.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_download.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_download.c busybox-1.18.1/archival/libipkg/ipkg_download.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_download.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,195 @@ +/* ipkg_download.c - the itsy package management system + @@ -3663,9 +3663,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.c busybox-1.17.2/ar + } + return 0; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.h busybox-1.17.2/archival/libipkg/ipkg_download.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_download.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_download.h busybox-1.18.1/archival/libipkg/ipkg_download.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_download.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,30 @@ +/* ipkg_download.h - the itsy package management system + @@ -3697,9 +3697,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.h busybox-1.17.2/ar +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_includes.h busybox-1.17.2/archival/libipkg/ipkg_includes.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_includes.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_includes.h busybox-1.18.1/archival/libipkg/ipkg_includes.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_includes.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,82 @@ +#ifndef IPKG_INCLUDES_H +#define IPKG_INCLUDES_H @@ -3783,9 +3783,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_includes.h busybox-1.17.2/ar +#include + +#endif /* IPKG_INCLUDES_H */ -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.c busybox-1.17.2/archival/libipkg/ipkg_install.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_install.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_install.c busybox-1.18.1/archival/libipkg/ipkg_install.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_install.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,1982 @@ +/* ipkg_install.c - the itsy package management system + @@ -5769,9 +5769,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.c busybox-1.17.2/arc +} + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.h busybox-1.17.2/archival/libipkg/ipkg_install.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_install.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_install.h busybox-1.18.1/archival/libipkg/ipkg_install.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_install.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,35 @@ +/* ipkg_install.h - the itsy package management system + @@ -5808,9 +5808,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.h busybox-1.17.2/arc +int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_message.c busybox-1.17.2/archival/libipkg/ipkg_message.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_message.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_message.c busybox-1.18.1/archival/libipkg/ipkg_message.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_message.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,35 @@ +/* ipkg_message.c - the itsy package management system + @@ -5847,9 +5847,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_message.c busybox-1.17.2/arc + ipkg_cb_message(conf,level,ts); + } +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_message.h busybox-1.17.2/archival/libipkg/ipkg_message.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_message.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_message.h busybox-1.18.1/archival/libipkg/ipkg_message.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_message.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,32 @@ +/* ipkg_message.h - the itsy package management system + @@ -5883,9 +5883,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_message.h busybox-1.17.2/arc +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...); + +#endif /* _IPKG_MESSAGE_H_ */ -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_remove.c busybox-1.17.2/archival/libipkg/ipkg_remove.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_remove.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_remove.c busybox-1.18.1/archival/libipkg/ipkg_remove.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_remove.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,385 @@ +/* ipkg_remove.c - the itsy package management system + @@ -6272,9 +6272,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_remove.c busybox-1.17.2/arch + + return 0; +