diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.21.1/0001-del-baudrates.patch b/meta-digi-dey/recipes-core/busybox/busybox/0001-del-baudrates.patch similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.21.1/0001-del-baudrates.patch rename to meta-digi-dey/recipes-core/busybox/busybox/0001-del-baudrates.patch diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.21.1/0002-del-flash_eraseall.patch b/meta-digi-dey/recipes-core/busybox/busybox/0002-del-flash_eraseall.patch similarity index 91% rename from meta-digi-dey/recipes-core/busybox/busybox-1.21.1/0002-del-flash_eraseall.patch rename to meta-digi-dey/recipes-core/busybox/busybox/0002-del-flash_eraseall.patch index 2771facf0..9b9e7511f 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.21.1/0002-del-flash_eraseall.patch +++ b/meta-digi-dey/recipes-core/busybox/busybox/0002-del-flash_eraseall.patch @@ -33,19 +33,19 @@ index 307afa7..feeeb7d 100644 # env var should be set for make invocation. # Here we check whether CFLAGS_busybox indeed contains that flag. diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c -index 0598371..ea5b969 100644 +index bf9b739..f202392 100644 --- a/miscutils/flash_eraseall.c +++ b/miscutils/flash_eraseall.c -@@ -21,6 +21,8 @@ +@@ -22,6 +22,8 @@ #include #include +#include "libdigi/digi-platforms.h" // is_nand_oob_atomic + #define OPTION_J (1 << 0) - #define OPTION_Q (1 << 1) - #define IS_NAND (1 << 2) -@@ -84,6 +86,17 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv) + #define OPTION_N (1 << 1) + #define OPTION_Q (1 << 2) +@@ -85,6 +87,17 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv) if (meminfo.type == MTD_NANDFLASH) flags |= IS_NAND; diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.21.1/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch b/meta-digi-dey/recipes-core/busybox/busybox/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch similarity index 92% rename from meta-digi-dey/recipes-core/busybox/busybox-1.21.1/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch rename to meta-digi-dey/recipes-core/busybox/busybox/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch index c55db1892..f7a708c72 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.21.1/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch +++ b/meta-digi-dey/recipes-core/busybox/busybox/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch @@ -14,10 +14,10 @@ Conflicts: 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/networking/ntpd.c b/networking/ntpd.c -index 79b7c37..01cd44b 100644 +index c4b0187..f93bf04 100644 --- a/networking/ntpd.c +++ b/networking/ntpd.c -@@ -221,6 +221,7 @@ typedef struct { +@@ -238,6 +238,7 @@ typedef struct { typedef struct { len_and_sockaddr *p_lsa; char *p_dotted; @@ -25,7 +25,7 @@ index 79b7c37..01cd44b 100644 int p_fd; int datapoint_idx; uint32_t lastpkt_refid; -@@ -708,8 +709,9 @@ add_peers(char *s) +@@ -738,8 +739,9 @@ add_peers(char *s) peer_t *p; p = xzalloc(sizeof(*p)); @@ -37,7 +37,7 @@ index 79b7c37..01cd44b 100644 p->p_fd = -1; p->p_xmt_msg.m_status = MODE_CLIENT | (NTP_VERSION << 3); p->next_action_time = G.cur_time; /* = set_next(p, 0); */ -@@ -758,6 +760,25 @@ send_query_to_peer(peer_t *p) +@@ -788,6 +790,25 @@ send_query_to_peer(peer_t *p) * * Uncomment this and use strace to see it in action: */ diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.21.1/acpid.map b/meta-digi-dey/recipes-core/busybox/busybox/acpid.map similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.21.1/acpid.map rename to meta-digi-dey/recipes-core/busybox/busybox/acpid.map diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.21.1/busybox-acpid b/meta-digi-dey/recipes-core/busybox/busybox/busybox-acpid similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.21.1/busybox-acpid rename to meta-digi-dey/recipes-core/busybox/busybox/busybox-acpid diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.21.1/busybox-ntpd b/meta-digi-dey/recipes-core/busybox/busybox/busybox-ntpd similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.21.1/busybox-ntpd rename to meta-digi-dey/recipes-core/busybox/busybox/busybox-ntpd diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.21.1/busybox-static-nodes b/meta-digi-dey/recipes-core/busybox/busybox/busybox-static-nodes similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.21.1/busybox-static-nodes rename to meta-digi-dey/recipes-core/busybox/busybox/busybox-static-nodes diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.21.1/defconfig b/meta-digi-dey/recipes-core/busybox/busybox/defconfig similarity index 99% rename from meta-digi-dey/recipes-core/busybox/busybox-1.21.1/defconfig rename to meta-digi-dey/recipes-core/busybox/busybox/defconfig index 82abf1da3..9fa748258 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.21.1/defconfig +++ b/meta-digi-dey/recipes-core/busybox/busybox/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.21.1 -# Tue Mar 4 10:56:29 2014 +# Busybox version: 1.22.1 +# Tue Mar 11 14:09:17 2014 # CONFIG_HAVE_DOT_CONFIG=y @@ -135,7 +135,14 @@ CONFIG_FEATURE_SEAMLESS_GZ=y # CONFIG_AR is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set # CONFIG_FEATURE_AR_CREATE is not set +CONFIG_UNCOMPRESS=y +CONFIG_GUNZIP=y CONFIG_BUNZIP2=y +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +# CONFIG_LZMA is not set +CONFIG_UNXZ=y +CONFIG_XZ=y CONFIG_BZIP2=y # CONFIG_CPIO is not set # CONFIG_FEATURE_CPIO_O is not set @@ -143,14 +150,13 @@ CONFIG_BZIP2=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y CONFIG_GZIP=y CONFIG_FEATURE_GZIP_LONG_OPTIONS=y CONFIG_GZIP_FAST=0 # CONFIG_LZOP is not set # CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM2CPIO is not set # CONFIG_RPM is not set +# CONFIG_RPM2CPIO is not set CONFIG_TAR=y CONFIG_FEATURE_TAR_CREATE=y CONFIG_FEATURE_TAR_AUTODETECT=y @@ -163,12 +169,6 @@ CONFIG_FEATURE_TAR_TO_COMMAND=y CONFIG_FEATURE_TAR_UNAME_GNAME=y CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y # CONFIG_FEATURE_TAR_SELINUX is not set -CONFIG_UNCOMPRESS=y -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -# CONFIG_LZMA is not set -CONFIG_UNXZ=y -CONFIG_XZ=y CONFIG_UNZIP=y # @@ -186,6 +186,7 @@ CONFIG_GROUPS=y CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_NODEREF=y CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y @@ -359,7 +360,16 @@ CONFIG_WHICH=y # # Editors # +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y +CONFIG_CMP=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_LONG_OPTIONS=y +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_ED is not set CONFIG_PATCH=y +CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 CONFIG_FEATURE_VI_8BIT=y @@ -374,14 +384,6 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_AWK=y -CONFIG_FEATURE_AWK_LIBM=y -CONFIG_CMP=y -CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_LONG_OPTIONS=y -CONFIG_FEATURE_DIFF_DIR=y -# CONFIG_ED is not set -CONFIG_SED=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -524,6 +526,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # Linux System Utilities # CONFIG_BLOCKDEV=y +CONFIG_FSTRIM=y CONFIG_MDEV=y CONFIG_FEATURE_MDEV_CONF=y CONFIG_FEATURE_MDEV_RENAME=y @@ -610,26 +613,27 @@ CONFIG_VOLUMEID=y # # Filesystem/Volume identification # -CONFIG_FEATURE_VOLUMEID_EXT=y CONFIG_FEATURE_VOLUMEID_BTRFS=y -CONFIG_FEATURE_VOLUMEID_REISERFS=y -CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y CONFIG_FEATURE_VOLUMEID_EXFAT=y +CONFIG_FEATURE_VOLUMEID_EXT=y +CONFIG_FEATURE_VOLUMEID_F2FS=y +CONFIG_FEATURE_VOLUMEID_FAT=y CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y CONFIG_FEATURE_VOLUMEID_JFS=y -CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_LUKS=y CONFIG_FEATURE_VOLUMEID_NILFS=y CONFIG_FEATURE_VOLUMEID_NTFS=y -CONFIG_FEATURE_VOLUMEID_ISO9660=y -CONFIG_FEATURE_VOLUMEID_UDF=y -CONFIG_FEATURE_VOLUMEID_LUKS=y -CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y -CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_OCFS2=y +CONFIG_FEATURE_VOLUMEID_REISERFS=y CONFIG_FEATURE_VOLUMEID_ROMFS=y CONFIG_FEATURE_VOLUMEID_SQUASHFS=y CONFIG_FEATURE_VOLUMEID_SYSV=y -CONFIG_FEATURE_VOLUMEID_OCFS2=y -CONFIG_FEATURE_VOLUMEID_LINUXRAID=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_XFS=y # # Miscellaneous Utilities @@ -647,6 +651,7 @@ CONFIG_FEATURE_LESS_REGEXP=y # CONFIG_FEATURE_LESS_LINENUMS is not set CONFIG_NANDWRITE=y CONFIG_NANDDUMP=y +CONFIG_RFKILL=y CONFIG_SETSERIAL=y CONFIG_UBIATTACH=y CONFIG_UBIDETACH=y @@ -654,6 +659,7 @@ CONFIG_UBIMKVOL=y CONFIG_UBIRMVOL=y CONFIG_UBIRSVOL=y CONFIG_UBIUPDATEVOL=y +# CONFIG_WALL is not set CONFIG_ADJTIMEX=y CONFIG_BBCONFIG=y CONFIG_FEATURE_COMPRESS_BBCONFIG=y @@ -710,7 +716,6 @@ CONFIG_MOUNTPOINT=y # CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set CONFIG_READAHEAD=y -CONFIG_RFKILL=y # CONFIG_RUNLEVEL is not set CONFIG_RX=y CONFIG_SETSID=y @@ -721,7 +726,6 @@ CONFIG_TIME=y CONFIG_TIMEOUT=y CONFIG_TTYSIZE=y # CONFIG_VOLNAME is not set -# CONFIG_WALL is not set CONFIG_WATCHDOG=y # diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.21.1/digi.gif b/meta-digi-dey/recipes-core/busybox/busybox/digi.gif similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.21.1/digi.gif rename to meta-digi-dey/recipes-core/busybox/busybox/digi.gif diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.21.1/index.html b/meta-digi-dey/recipes-core/busybox/busybox/index.html similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.21.1/index.html rename to meta-digi-dey/recipes-core/busybox/busybox/index.html diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.21.1/pswitch-press b/meta-digi-dey/recipes-core/busybox/busybox/pswitch-press similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.21.1/pswitch-press rename to meta-digi-dey/recipes-core/busybox/busybox/pswitch-press diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.21.1/pswitch-release b/meta-digi-dey/recipes-core/busybox/busybox/pswitch-release similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.21.1/pswitch-release rename to meta-digi-dey/recipes-core/busybox/busybox/pswitch-release diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.21.1/suspend b/meta-digi-dey/recipes-core/busybox/busybox/suspend similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.21.1/suspend rename to meta-digi-dey/recipes-core/busybox/busybox/suspend diff --git a/meta-digi-dey/recipes-core/busybox/busybox_1.21.1.bbappend b/meta-digi-dey/recipes-core/busybox/busybox_1.22.1.bbappend similarity index 97% rename from meta-digi-dey/recipes-core/busybox/busybox_1.21.1.bbappend rename to meta-digi-dey/recipes-core/busybox/busybox_1.22.1.bbappend index 76dc5ef06..8ec2de7c8 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox_1.21.1.bbappend +++ b/meta-digi-dey/recipes-core/busybox/busybox_1.22.1.bbappend @@ -3,7 +3,7 @@ PRINC := "${@int(PRINC) + 1}" PR_append = "+${DISTRO}" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" DEPENDS += "libdigi"