Fixed patches and configs

config/boot-odroid.ini

@@ -0,0 +1,196 @@
+ODROIDXU-UBOOT-CONFIG
+
+# U-Boot Parameters
+setenv initrd_high "0xffffffff"
+setenv fdt_high "0xffffffff"
+
+# Mac address configuration
+setenv macaddr "00:1e:06:61:7a:55
+
+#------------------------------------------------------------------------------------------------------
+# Basic Ubuntu Setup. Don't touch unless you know what you are doing.
+# --------------------------------
+setenv bootrootfs "console=tty1 console=ttySAC2,115200n8 root=/dev/mmcblk0p2 rootwait ro fsck.repair=yes"
+
+# boot commands
+setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x44000000 dtb/exynos5422-odroidxu3.dtb; bootz 0x40008000 0x44000000"
+
+# --- Screen Configuration for HDMI --- # 
+# ---------------------------------------
+# Uncomment only ONE line! Leave all commented for automatic selection.
+# Uncomment only the setenv line!
+# ---------------------------------------
+# ODROID-VU forced resolution
+# setenv videoconfig "video=HDMI-A-1:1280x800@60"
+# -----------------------------------------------
+# ODROID-VU forced EDID
+# setenv videoconfig "drm_kms_helper.edid_firmware=edid/1280x800.bin"
+# -----------------------------------------------
+# 1920x1080 (1080P) with monitor provided EDID information. (1080p-edid)
+# setenv videoconfig "video=HDMI-A-1:1920x1080@60"
+# -----------------------------------------------
+# 1920x1080 (1080P) without monitor data using generic information (1080p-noedid)
+# setenv videoconfig "drm_kms_helper.edid_firmware=edid/1920x1080.bin"
+# -----------------------------------------------
+# 1920x1080 50hz (1080P) with monitor provided EDID information. (1080p 50hz-edid)
+# setenv videoconfig "video=HDMI-A-1:1920x1080@50"
+# -----------------------------------------------
+# 1920x1080 50hz (1080P) without monitor data using generic information (1080p 50hz-noedid)
+# setenv videoconfig "drm_kms_helper.edid_firmware=edid/1920x1080_50hz.bin"
+# -----------------------------------------------
+# 1440x900 with monitor provided EDID information.
+# setenv videoconfig "video=HDMI-A-1:1440x900@60"
+# -----------------------------------------------
+# 1440x900 without monitor data using generic information 
+# setenv videoconfig "drm_kms_helper.edid_firmware=edid/1440x900.bin"
+# -----------------------------------------------
+# 1280x720 (720P) with monitor provided EDID information. (720p-edid)
+# setenv videoconfig "video=HDMI-A-1:1280x720@60"
+# -----------------------------------------------
+# 1280x720 (720P) without monitor data using generic information (720p-noedid)
+# setenv videoconfig "drm_kms_helper.edid_firmware=edid/1280x720.bin"
+# -----------------------------------------------
+# 1024x768 without monitor data using generic information
+# setenv videoconfig "drm_kms_helper.edid_firmware=edid/1024x768.bin"
+# -----------------------------------------------
+# 800x600 without monitor data using generic information 
+# setenv videoconfig "drm_kms_helper.edid_firmware=edid/800x600.bin"
+# -----------------------------------------------
+# 800x480 without monitor data using generic information (ODROID 7")
+# setenv videoconfig "drm_kms_helper.edid_firmware=edid/800x480.bin"
+# -----------------------------------------------
+# 720x576 without monitor data using generic information 
+# setenv videoconfig "drm_kms_helper.edid_firmware=edid/720x576.bin"
+# -----------------------------------------------
+# 720x480 without monitor data using generic information 
+# setenv videoconfig "drm_kms_helper.edid_firmware=edid/720x480.bin"
+# -----------------------------------------------
+# 640x480 without monitor data using generic information
+# setenv videoconfig "drm_kms_helper.edid_firmware=edid/640x480.bin"
+
+
+# --- HDMI / DVI Mode Selection ---
+# ------------------------------------------
+# - HDMI Mode
+setenv vout "hdmi"
+# - DVI Mode (disables sound over HDMI as per DVI compat)
+# setenv vout "dvi"
+
+
+# --- CPU Governor Setup ---
+# Uncomment only one line. New governor is set after 90secs after boot.
+# ------------------------------------------
+# - Performance (Keep all the CPU's at Maximum frequency)
+setenv governor "performance"
+# ------------------------------------------
+# - Ondemand
+# setenv governor "ondemand"
+# ------------------------------------------
+# - Interactive (Pretty much just like ondemand with more possible customization via sysfs.)
+# setenv governor "interactive"
+# ------------------------------------------
+# - Conservative (Like ondemand, but do the frequency transitions more slowly, great for battery powered applications)
+# setenv governor "conservative"
+# ------------------------------------------
+# - Powersave (Keeps the CPU's to the lowest possible temps)
+# setenv governor "powersave"
+
+
+#------------------------------------------------------------------------------
+#
+# HDMI-PHY Parameter Control
+#
+#------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
+#
+# HDMI Hot Plug detection
+#
+#------------------------------------------------------------------------------
+#
+# Forces the HDMI subsystem to ignore the check if the cable is connected or 
+# not.
+# false : disable the detection and force it as connected.
+# true : let cable, board and monitor decide the connection status.
+# 
+# default: true
+# 
+#------------------------------------------------------------------------------
+setenv HPD "true"
+
+#------------------------------------------------------------------------------
+#
+#  TMDS data amplitude control.
+#
+#------------------------------------------------------------------------------
+#
+#  1LSB corresponds to 20 mVdiff amplitude level.
+#  tx_amp_lvl : 0 = 760 mVdiff(Min), 31 = 1380 mVdiff(Max)
+#
+#  Hardkernel default hdmi_tx_amp_lvl = 31(1380 mVdiff);
+#------------------------------------------------------------------------------
+setenv hdmi_tx_amp_lvl  "31"
+
+#------------------------------------------------------------------------------
+#
+#  TMDS data amplitude fine control for each channel.
+#
+#------------------------------------------------------------------------------
+#
+#  1LSB corresponds to 20 mVdiff amplitude level.
+#  tx_lvl : 0 = 0 mVdiff(Min), 3 = 60 mVdiff(Max)
+#
+#  Hardkernel default
+#      hdmi_tx_lvl_ch0 = 3, hdmi_tx_lvl_ch1 = 3, hdmi_tx_lvl_ch2 = 3,
+#------------------------------------------------------------------------------
+setenv hdmi_tx_lvl_ch0      "3"
+setenv hdmi_tx_lvl_ch1      "3"
+setenv hdmi_tx_lvl_ch2      "3"
+
+#------------------------------------------------------------------------------
+#
+#  TMDS data pre-emphasis level control.
+#
+#------------------------------------------------------------------------------
+#
+#  1LSB corresponds to -0.45dB emphasis level except for 1
+#  tx_emp_lvl : 0 = 0 db(Min), 1 = -0.25 db, 2 = 0.7 db, 15 = -7.45 db(Max)
+#
+#  Hardkernel default hdmi_tx_emp_lvl = 6 (-2.50 db);
+#------------------------------------------------------------------------------
+setenv hdmi_tx_emp_lvl      "6"
+
+#------------------------------------------------------------------------------
+#
+#  TMDS clock amplitude control.
+#
+#------------------------------------------------------------------------------
+#
+#  1LSB corresponds to 20 mVdiff amplitude level.
+#  clk_amp_lvl : 0 = 790 mVdiff(Min), 31 = 1410 mVdiff(Max)
+#
+#  Hardkernel default hdmi_clk_amp_lvl = 31 (1410 mVdiff)
+#------------------------------------------------------------------------------
+setenv hdmi_clk_amp_lvl     "31"
+
+#------------------------------------------------------------------------------
+#
+#  TMDS data source termination resistor control.
+#
+#------------------------------------------------------------------------------
+#
+#  tx_res :
+#      0 = Source Termination OFF(Min), 1 = 200 ohm, 2 = 300 ohm, 3 = 120 ohm(Max)
+#
+#  Hardkernrel default hdmi_tx_res = 0 (Source Termination OFF)
+#------------------------------------------------------------------------------
+setenv hdmi_tx_res      "0"
+
+#------------------------------------------------------------------------------
+
+setenv hdmi_phy_control "hdmi_tx_amp_lvl=${hdmi_tx_amp_lvl} hdmi_tx_lvl_ch0=${hdmi_tx_lvl_ch0} hdmi_tx_lvl_ch1=${hdmi_tx_lvl_ch1} hdmi_tx_lvl_ch2=${hdmi_tx_lvl_ch2} hdmi_tx_emp_lvl=${hdmi_tx_emp_lvl} hdmi_clk_amp_lvl=${hdmi_clk_amp_lvl} hdmi_tx_res=${hdmi_tx_res} HPD=${HPD} vout=${vout}"
+
+# final boot args
+setenv bootargs "${bootrootfs} ${videoconfig} smsc95xx.macaddr=${macaddr} governor=${governor} ${hdmi_phy_control}"
+# drm.debug=0xff
+# Boot the board
+boot

config/xorg.conf.cubox

@@ -0,0 +1,14 @@
+Section "Device"
+    Identifier  "i.MX Accelerated Framebuffer Device"
+    Driver      "vivante"
+    Option      "fbdev"     "/dev/fb0"
+    Option      "vivante_fbdev" "/dev/fb0"
+    Option      "HWcursor"  "false"
+EndSection
+
+Section "ServerFlags"
+    Option "BlankTime"  "0"
+    Option "StandbyTime"  "0"
+    Option "SuspendTime"  "0"
+    Option "OffTime"  "0"
+EndSection

patch/kernel/cubox-default/patch-3.14.19-20.patch

@@ -5486,15 +5486,6 @@ index 9da566a3f5c8..e47aabe0c760 100644
  	{ } /* Terminating entry */
  };
  MODULE_DEVICE_TABLE(usb, option_ids);
-@@ -1917,6 +1940,8 @@ static void option_instat_callback(struct urb *urb)
- 			dev_dbg(dev, "%s: type %x req %x\n", __func__,
- 				req_pkt->bRequestType, req_pkt->bRequest);
- 		}
-+	} else if (status == -ENOENT || status == -ESHUTDOWN) {
-+		dev_dbg(dev, "%s: urb stopped: %d\n", __func__, status);
- 	} else
- 		dev_err(dev, "%s: error %d\n", __func__, status);
- 
 diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
 index b3d5a35c0d4b..e9bad928039f 100644
 --- a/drivers/usb/serial/pl2303.c

patch/kernel/cubox-default/patch-3.14.30-31.patch

@@ -2412,19 +2412,6 @@ index 4913c0690872..175584ad643f 100644
  		/* we would like to get this block, possibly by computing it,
  		 * otherwise read it if the backing disk is insync
  		 */
-diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
-index 7e0176321aff..881bf89acfcc 100644
---- a/drivers/mmc/host/sdhci.c
-+++ b/drivers/mmc/host/sdhci.c
-@@ -2537,7 +2537,7 @@ out:
- 	/*
- 	 * We have to delay this as it calls back into the driver.
- 	 */
--	if (cardint)
-+	if (cardint && host->mmc->sdio_irqs)
- 		mmc_signal_sdio_irq(host->mmc);
- 
- 	return result;
 diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
 index cc11f7f5e91d..1468c4658804 100644
 --- a/drivers/net/can/dev.c

patch/kernel/cubox-default/patch-3.14.35-36.patch

@@ -1151,35 +1151,6 @@ index a3399c4f13a9..b9b651ea9851 100644
  
  	/* Bring BB/MAC out of reset */
  	iowrite32(regval & ~val, reg);
-diff --git a/drivers/net/wireless/ath/ath6kl/hif.h b/drivers/net/wireless/ath/ath6kl/hif.h
-index 61f6b21fb0ae..dc6bd8cd9b83 100644
---- a/drivers/net/wireless/ath/ath6kl/hif.h
-+++ b/drivers/net/wireless/ath/ath6kl/hif.h
-@@ -197,9 +197,9 @@ struct hif_scatter_req {
- 	/* bounce buffer for upper layers to copy to/from */
- 	u8 *virt_dma_buf;
- 
--	struct hif_scatter_item scat_list[1];
--
- 	u32 scat_q_depth;
-+
-+	struct hif_scatter_item scat_list[0];
- };
- 
- struct ath6kl_irq_proc_registers {
-diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c
-index 7126bdd4236c..6bf15a331714 100644
---- a/drivers/net/wireless/ath/ath6kl/sdio.c
-+++ b/drivers/net/wireless/ath/ath6kl/sdio.c
-@@ -348,7 +348,7 @@ static int ath6kl_sdio_alloc_prep_scat_req(struct ath6kl_sdio *ar_sdio,
- 	int i, scat_req_sz, scat_list_sz, size;
- 	u8 *virt_buf;
- 
--	scat_list_sz = (n_scat_entry - 1) * sizeof(struct hif_scatter_item);
-+	scat_list_sz = n_scat_entry * sizeof(struct hif_scatter_item);
- 	scat_req_sz = sizeof(*s_req) + scat_list_sz;
- 
- 	if (!virt_scat)
 diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
 index 5642a9b250c2..953bd0bfdf0d 100644
 --- a/drivers/scsi/be2iscsi/be_main.c

patch/kernel/cubox-default/patch-3.14.37-38.patch

@@ -825,18 +825,21 @@ diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
 index 715589ff0eda..e93c36fd3073 100644
 --- a/sound/soc/codecs/sgtl5000.c
 +++ b/sound/soc/codecs/sgtl5000.c
-@@ -1198,13 +1198,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)
- 		/* Enable VDDC charge pump */
+@@ -1198,16 +1198,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)
+                 		/* Enable VDDC charge pump */
  		ana_pwr |= SGTL5000_VDDC_CHRGPMP_POWERUP;
  	} else if (vddio >= 3100 && vdda >= 3100) {
 -		/*
 -		 * if vddio and vddd > 3.1v,
 -		 * charge pump should be clean before set ana_pwr
 -		 */
--		snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER,
--				SGTL5000_VDDC_CHRGPMP_POWERUP, 0);
+-// FIXME: this is total crap - we have read this register above into
+-// ana_pwr, which we then modify (above), and then write back to the
+-// register below.  This modification just gets completely overwritten.
+-//		snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER,
+-//				SGTL5000_VDDC_CHRGPMP_POWERUP, 0);
 -
-+		ana_pwr &= ~SGTL5000_VDDC_CHRGPMP_POWERUP;
++		ana_pwr &= ~SGTL5000_VDDC_CHRGPMP_POWERUP; 
  		/* VDDC use VDDIO rail */
  		lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD;
  		lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO <<

patch/kernel/cubox-default/patch-3.14.39-40.patch

@@ -1122,26 +1122,6 @@ index 80bfa0391913..075e7e7abea9 100644
  	return num_wrbs;
  }
  
-diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
-index ad5a5aadc7e1..70eb4d27b4fa 100644
---- a/drivers/net/ethernet/freescale/gianfar.c
-+++ b/drivers/net/ethernet/freescale/gianfar.c
-@@ -2152,13 +2152,13 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
- 		skb_new = skb_realloc_headroom(skb, fcb_len);
- 		if (!skb_new) {
- 			dev->stats.tx_errors++;
--			kfree_skb(skb);
-+			dev_kfree_skb_any(skb);
- 			return NETDEV_TX_OK;
- 		}
- 
- 		if (skb->sk)
- 			skb_set_owner_w(skb_new, skb->sk);
--		consume_skb(skb);
-+		dev_consume_skb_any(skb);
- 		skb = skb_new;
- 	}
- 
 diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
 index 57e390cbe6d0..f42c201f727f 100644
 --- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c

patch/kernel/odroid-next/packaging-next.patch

@@ -0,0 +1,152 @@
+diff --git a/scripts/package/builddeb b/scripts/package/builddeb
+index 88dbf23..fc023a9 100755
+--- a/scripts/package/builddeb
++++ b/scripts/package/builddeb
+@@ -80,11 +80,13 @@ tmpdir="$objtree/debian/tmp"
+ fwdir="$objtree/debian/fwtmp"
+ kernel_headers_dir="$objtree/debian/hdrtmp"
+ libc_headers_dir="$objtree/debian/headertmp"
++dtb_dir="$objtree/debian/dtbtmp"
+ dbg_dir="$objtree/debian/dbgtmp"
+-packagename=linux-image-$version
+-fwpackagename=linux-firmware-image-$version
+-kernel_headers_packagename=linux-headers-$version
+-libc_headers_packagename=linux-libc-dev
++packagename=linux-image-next"$LOCALVERSION"
++fwpackagename=linux-firmware-image-next"$LOCALVERSION"
++kernel_headers_packagename=linux-headers-next"$LOCALVERSION"
++dtb_packagename=linux-dtb-next"$LOCALVERSION"
++libc_headers_packagename=linux-libc-dev-next"$LOCALVERSION"
+ dbg_packagename=$packagename-dbg
+ 
+ if [ "$ARCH" = "um" ] ; then
+@@ -108,13 +110,17 @@ esac
+ BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
+ 
+ # Setup the directory structure
+-rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir"
++rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" "$dtb_dir"
+ mkdir -m 755 -p "$tmpdir/DEBIAN"
+ mkdir -p  "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
+ mkdir -m 755 -p "$fwdir/DEBIAN"
+ mkdir -p "$fwdir/lib/firmware/$version/" "$fwdir/usr/share/doc/$fwpackagename"
+ mkdir -m 755 -p "$libc_headers_dir/DEBIAN"
+ mkdir -p "$libc_headers_dir/usr/share/doc/$libc_headers_packagename"
++
++mkdir -m 755 -p "$dtb_dir/DEBIAN"
++mkdir -p "$dtb_dir/boot/dtb" "$dtb_dir/usr/share/doc/$dtb_packagename"
++
+ mkdir -m 755 -p "$kernel_headers_dir/DEBIAN"
+ mkdir -p "$kernel_headers_dir/usr/share/doc/$kernel_headers_packagename"
+ mkdir -p "$kernel_headers_dir/lib/modules/$version/"
+@@ -165,6 +171,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
+ 	fi
+ fi
+ 
++if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG ; then
++	#mkdir -p "$tmpdir/boot/dtb"
++	INSTALL_DTBS_PATH="$dtb_dir/boot/dtb" $MAKE KBUILD_SRC= dtbs_install
++fi
++
+ if [ "$ARCH" != "um" ]; then
+ 	$MAKE headers_check KBUILD_SRC=
+ 	$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
+@@ -177,7 +188,7 @@ fi
+ # so do we; recent versions of dracut and initramfs-tools will obey this.
+ debhookdir=${KDEB_HOOKDIR:-/etc/kernel}
+ if grep -q '^CONFIG_BLK_DEV_INITRD=y' $KCONFIG_CONFIG; then
+-	want_initrd=Yes
++	want_initrd=Yes 
+ else
+ 	want_initrd=No
+ fi
+@@ -189,9 +200,11 @@ for script in postinst postrm preinst prerm ; do
+ set -e
+ 
+ # Pass maintainer script parameters to hook scripts
++
+ export DEB_MAINT_PARAMS="\$*"
+ 
+ # Tell initramfs builder whether it's wanted
++
+ export INITRD=$want_initrd
+ 
+ test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d
+@@ -200,6 +213,29 @@ EOF
+ 	chmod 755 "$tmpdir/DEBIAN/$script"
+ done
+ 
++##
++## Create sym link to kernel image
++##
++sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
++cat >> $tmpdir/DEBIAN/postinst <<EOT 
++if [ "\$(grep nand /proc/partitions)" != "" ] && [ "\$(grep mmc /proc/partitions)" = "" ]; then
++mkimage -A arm -O linux -T kernel -C none -a "0x40008000" -e "0x40008000" -n "Linux kernel" -d /$installed_image_path /boot/uImage  > /dev/null 2>&1
++rm -f /$installed_image_path /boot/zImage
++else
++ln -sf /$installed_image_path /boot/zImage > /dev/null 2>&1 || mv /$installed_image_path /boot/zImage
++fi
++touch /boot/.next
++exit 0
++EOT
++##
++## FAT install workaround
++##
++sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst
++cat >> $tmpdir/DEBIAN/preinst <<EOT 
++rm -f /boot/System.map* /boot/config* /$installed_image_path /boot/zImage
++EOT
++echo "exit 0" >> $tmpdir/DEBIAN/preinst 
++
+ # Try to determine maintainer and email values
+ if [ -n "$DEBEMAIL" ]; then
+        email=$DEBEMAIL
+@@ -306,6 +342,12 @@ fi
+ (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
+ destdir=$kernel_headers_dir/usr/src/linux-headers-$version
+ mkdir -p "$destdir"
++######################## headers patch
++ZACNI=$(pwd)
++cd $destdir
++patch -p1 < /tmp/headers-debian-byteshift.patch
++cd $ZACNI
++######################## headers patch
+ (cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
+ (cd $objtree; tar -c -f - -T -) < "$objtree/debian/hdrobjfiles" | (cd $destdir; tar -xf -)
+ (cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
+@@ -315,7 +357,7 @@ rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
+ cat <<EOF >> debian/control
+ 
+ Package: $kernel_headers_packagename
+-Provides: linux-headers, linux-headers-2.6
++Provides: linux-headers
+ Architecture: any
+ Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
+  This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
+@@ -341,6 +383,16 @@ fi
+ 
+ cat <<EOF >> debian/control
+ 
++Package: $dtb_packagename
++Architecture: any
++Description: Linux DTB, version $version
++ This package contains device blobs from the Linux kernel, version $version.
++EOF
++
++create_package "$dtb_packagename" "$dtb_dir"
++
++cat <<EOF >> debian/control
++
+ Package: $libc_headers_packagename
+ Section: devel
+ Provides: linux-kernel-headers
+@@ -352,7 +404,7 @@ EOF
+ 
+ if [ "$ARCH" != "um" ]; then
+ 	create_package "$kernel_headers_packagename" "$kernel_headers_dir"
+-	create_package "$libc_headers_packagename" "$libc_headers_dir"
++#	create_package "$libc_headers_packagename" "$libc_headers_dir"
+ fi
+ 
+ create_package "$packagename" "$tmpdir"